summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/backupstore/HousekeepStoreAccount.cpp2
-rw-r--r--lib/backupstore/HousekeepStoreAccount.h2
-rw-r--r--lib/bbackupd/BackupDaemon.cpp2
-rw-r--r--lib/common/DebugMemLeakFinder.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp
index d5acf62c..78165538 100644
--- a/lib/backupstore/HousekeepStoreAccount.cpp
+++ b/lib/backupstore/HousekeepStoreAccount.cpp
@@ -561,7 +561,7 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID,
// Created: 11/12/03
//
// --------------------------------------------------------------------------
-bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y)
+bool HousekeepStoreAccount::DelEnCompare::operator()(const HousekeepStoreAccount::DelEn &x, const HousekeepStoreAccount::DelEn &y) const
{
// STL spec says this:
// A Strict Weak Ordering is a Binary Predicate that compares two objects, returning true if the first precedes the second.
diff --git a/lib/backupstore/HousekeepStoreAccount.h b/lib/backupstore/HousekeepStoreAccount.h
index ff9e9ffe..908d6ec1 100644
--- a/lib/backupstore/HousekeepStoreAccount.h
+++ b/lib/backupstore/HousekeepStoreAccount.h
@@ -72,7 +72,7 @@ private:
struct DelEnCompare
{
- bool operator()(const DelEn &x, const DelEn &y);
+ bool operator()(const DelEn &x, const DelEn &y) const;
};
int mAccountID;
diff --git a/lib/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp
index f4dcf270..4dac5f2e 100644
--- a/lib/bbackupd/BackupDaemon.cpp
+++ b/lib/bbackupd/BackupDaemon.cpp
@@ -2339,7 +2339,7 @@ void BackupDaemon::SendSyncStartOrFinish(bool SendStart)
// by code, rather than the OS.
typedef struct
{
- bool operator()(const std::string &s1, const std::string &s2)
+ bool operator()(const std::string &s1, const std::string &s2) const
{
if(s1.size() == s2.size())
{
diff --git a/lib/common/DebugMemLeakFinder.cpp b/lib/common/DebugMemLeakFinder.cpp
index 58a82c0e..dd42173d 100644
--- a/lib/common/DebugMemLeakFinder.cpp
+++ b/lib/common/DebugMemLeakFinder.cpp
@@ -703,7 +703,7 @@ void *operator new(size_t size)
}
*/
-void *operator new[](size_t size) throw (std::bad_alloc)
+void *operator new[](size_t size) noexcept(false)
{
return internal_new(size, "standard libraries", 0);
}
@@ -717,12 +717,12 @@ void internal_delete(void *ptr)
//TRACE1("delete[]() called, %08x\n", ptr);
}
-void operator delete[](void *ptr) throw ()
+void operator delete[](void *ptr) noexcept
{
internal_delete(ptr);
}
-void operator delete(void *ptr) throw ()
+void operator delete(void *ptr) noexcept
{
internal_delete(ptr);
}