Skip to content

Commit

Permalink
Merge pull request hpcc-systems#18998 from richardkchapman/HPCC-32440
Browse files Browse the repository at this point in the history
HPCC-32440 Make all errors into warnings in azurefile dll

Reviewed-by: Gavin Halliday <[email protected]>
Merged-by: Gavin Halliday <[email protected]>
  • Loading branch information
ghalliday authored Sep 4, 2024
2 parents fee99ab + 98527f9 commit d4aa2ce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions common/remote/hooks/azure/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ find_package(azure-storage-files-shares-cpp CONFIG REQUIRED)
find_package(azure-storage-common-cpp CONFIG REQUIRED)

project( azurefile )
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STRICT_CXX_FLAGS}")

set ( SRCS
azurefile.cpp
Expand Down
5 changes: 3 additions & 2 deletions common/remote/hooks/azure/azurefile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ class AzureAPICopyClientBase : public CInterfaceOf<IAPICopyClientOp>
status = ApiCopyStatus::Failed;
}
// fallthrough to delete any file remnants
[[fallthrough]];
case ApiCopyStatus::Success:
// already copied-> need to delete
try
Expand Down Expand Up @@ -935,7 +936,7 @@ class AzureFileClient : public AzureAPICopyClientBase

virtual void doStartCopy(const char * source) override
{
fileCopyOp = std::move(fileClient->StartCopy(source));
fileCopyOp = fileClient->StartCopy(source);
}
virtual ApiCopyStatus doGetProgress(CDateTime & dateTime, int64_t & outputLength) override
{
Expand Down Expand Up @@ -977,7 +978,7 @@ class AzureBlobClient : public AzureAPICopyClientBase

virtual void doStartCopy(const char * source) override
{
blobCopyOp = std::move(blobClient->StartCopyFromUri(source));
blobCopyOp = blobClient->StartCopyFromUri(source);
}
virtual ApiCopyStatus doGetProgress(CDateTime & dateTime, int64_t & outputLength) override
{
Expand Down
2 changes: 1 addition & 1 deletion system/jlib/jatomic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class RelaxedAtomic : public std::atomic<T>
RelaxedAtomic() noexcept = default;
inline constexpr RelaxedAtomic(T _value) noexcept : BASE(_value) { }
~RelaxedAtomic() noexcept = default;
RelaxedAtomic(const RelaxedAtomic& _value) { BASE::store(_value.load()); }
RelaxedAtomic(const RelaxedAtomic& _value) : BASE(_value.load()) { }
RelaxedAtomic& operator=(const RelaxedAtomic&) = delete;

inline operator T() const noexcept { return load(); }
Expand Down

0 comments on commit d4aa2ce

Please sign in to comment.