diff --git a/port/port_posix.h b/port/port_posix.h index 0d0e9bf139..16fae8f49c 100644 --- a/port/port_posix.h +++ b/port/port_posix.h @@ -16,7 +16,7 @@ // in fact, we could use that one #define ROCKSDB_PRIszt "zu" -#define NOEXCEPT noexcept +#define ROCKSDB_NOEXCEPT noexcept #undef PLATFORM_IS_LITTLE_ENDIAN #if defined(OS_MACOSX) diff --git a/port/win/port_win.h b/port/win/port_win.h index 49d3728723..11ef74f0d1 100644 --- a/port/win/port_win.h +++ b/port/win/port_win.h @@ -58,7 +58,7 @@ typedef SSIZE_T ssize_t; #define ROCKSDB_PRIszt "Iu" #endif -#define NOEXCEPT +#define ROCKSDB_NOEXCEPT #define __attribute__(A) diff --git a/utilities/backupable/backupable_db.cc b/utilities/backupable/backupable_db.cc index 9eb0e0f264..82894044a6 100644 --- a/utilities/backupable/backupable_db.cc +++ b/utilities/backupable/backupable_db.cc @@ -344,9 +344,9 @@ class BackupEngineImpl : public BackupEngine { CopyWorkItem(const CopyWorkItem&) = delete; CopyWorkItem& operator=(const CopyWorkItem&) = delete; - CopyWorkItem(CopyWorkItem&& o) NOEXCEPT { *this = std::move(o); } + CopyWorkItem(CopyWorkItem&& o) ROCKSDB_NOEXCEPT { *this = std::move(o); } - CopyWorkItem& operator=(CopyWorkItem&& o) NOEXCEPT { + CopyWorkItem& operator=(CopyWorkItem&& o) ROCKSDB_NOEXCEPT { src_path = std::move(o.src_path); dst_path = std::move(o.dst_path); src_env = o.src_env; @@ -384,11 +384,11 @@ class BackupEngineImpl : public BackupEngine { std::string dst_relative; BackupAfterCopyWorkItem() {} - BackupAfterCopyWorkItem(BackupAfterCopyWorkItem&& o) NOEXCEPT { + BackupAfterCopyWorkItem(BackupAfterCopyWorkItem&& o) ROCKSDB_NOEXCEPT { *this = std::move(o); } - BackupAfterCopyWorkItem& operator=(BackupAfterCopyWorkItem&& o) NOEXCEPT { + BackupAfterCopyWorkItem& operator=(BackupAfterCopyWorkItem&& o) ROCKSDB_NOEXCEPT { result = std::move(o.result); shared = o.shared; needed_to_copy = o.needed_to_copy; @@ -419,11 +419,11 @@ class BackupEngineImpl : public BackupEngine { RestoreAfterCopyWorkItem(std::future&& _result, uint32_t _checksum_value) : result(std::move(_result)), checksum_value(_checksum_value) {} - RestoreAfterCopyWorkItem(RestoreAfterCopyWorkItem&& o) NOEXCEPT { + RestoreAfterCopyWorkItem(RestoreAfterCopyWorkItem&& o) ROCKSDB_NOEXCEPT { *this = std::move(o); } - RestoreAfterCopyWorkItem& operator=(RestoreAfterCopyWorkItem&& o) NOEXCEPT { + RestoreAfterCopyWorkItem& operator=(RestoreAfterCopyWorkItem&& o) ROCKSDB_NOEXCEPT { result = std::move(o.result); checksum_value = o.checksum_value; return *this;