diff options
| author | Andrew Morrow <acm@mongodb.com> | 2015-01-03 10:55:42 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2015-02-13 13:01:12 -0500 |
| commit | 05d73815c390e344842ac8870acfea53498279ea (patch) | |
| tree | f47dd823f6b7982df32480eb14c5834277fd72ce /src/mongo/unittest/unittest.h | |
| parent | c1b5595b5fdf93e0599bbdd4154f35bfa10fadd1 (diff) | |
| download | mongo-05d73815c390e344842ac8870acfea53498279ea.tar.gz | |
SERVER-16559 Require C++11 and remove conditional compilation
Diffstat (limited to 'src/mongo/unittest/unittest.h')
| -rw-r--r-- | src/mongo/unittest/unittest.h | 7 |
1 files changed, 2 insertions, 5 deletions
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); |