SERVER-16559 Require C++11 and remove conditional compilation

2 files changed, 3 insertions, 9 deletions

diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp
index f484c70f079..477045a27d0 100644
--- a/src/mongo/unittest/unittest.cpp
+++ b/src/mongo/unittest/unittest.cpp
@@ -400,10 +400,7 @@ namespace {
             return *this;
         }
 
-        TestAssertionFailure::~TestAssertionFailure()
-#if __cplusplus >= 201103
-        noexcept(false)
-#endif
+        TestAssertionFailure::~TestAssertionFailure() BOOST_NOEXCEPT_IF(false)
         {
             if (!_enabled) {
                 invariant(_stream.str().empty());
diff --git a/src/mongo/unittest/unittest.h b/src/mongo/unittest/unittest.h
index bb31bfa30ed..b5f6f3eb850 100644
--- a/src/mongo/unittest/unittest.h
+++ b/src/mongo/unittest/unittest.h
@@ -39,6 +39,7 @@
 #include <string>
 #include <vector>
 
+#include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
@@ -440,11 +441,7 @@ namespace mongo {
             TestAssertionFailure(
                     const std::string& file, unsigned line, const std::string& message);
             TestAssertionFailure(const TestAssertionFailure& other);
-#if __cplusplus < 201103
-            ~TestAssertionFailure();
-#else
-            ~TestAssertionFailure() noexcept(false);
-#endif
+            ~TestAssertionFailure() BOOST_NOEXCEPT_IF(false);
 
             TestAssertionFailure& operator=(const TestAssertionFailure& other);