summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2016-01-23 22:16:14 (GMT)
committerChristian Pointner <equinox@anytun.org>2016-01-23 22:16:14 (GMT)
commit3535471723250a31b12a128c31160342787f9dde (patch)
treef76852b797820e0ddc4c3f8d842305a2eed10d32
parentc11f7fa2b9198b80ab2e858ea22ac2862224ed19 (diff)
fixed warning due to change of handling of exceptions inside descrutors since C++11
-rw-r--r--src/anytunError.h2
-rw-r--r--src/datatypes.h7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/anytunError.h b/src/anytunError.h
index e31fa0e..0505497 100644
--- a/src/anytunError.h
+++ b/src/anytunError.h
@@ -81,7 +81,7 @@ class ErrorStringBuilder
public:
ErrorStringBuilder(ErrorStringBuilder const& src) { stream << src.stream.str(); };
ErrorStringBuilder() {};
- ~ErrorStringBuilder() { throw std::runtime_error(stream.str()); };
+ ~ErrorStringBuilder() NOEXCEPT(false) { throw std::runtime_error(stream.str()); };
template<class T>
std::ostream& operator<<(T const& value) { return stream << value; }
diff --git a/src/datatypes.h b/src/datatypes.h
index bce14dd..85ae9c4 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -48,6 +48,13 @@
#include <boost/cstdint.hpp>
#include <boost/integer_traits.hpp>
+#include <boost/config.hpp>
+
+#ifndef BOOST_NO_NOEXCEPT
+#define NOEXCEPT(x) noexcept(x)
+#else
+#define NOEXCEPT(x)
+#endif
// should not be necessary on GCC, #ifdef + #include <stdint.h> should do the job; still required on MS VC++9, though.
using boost::int8_t;