From 44c190064c0e52fcdb8db0906056b2bd6f46d306 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sun, 23 Aug 2015 04:04:36 +0300
Subject: cxx: Boost.Config for compiler workarounds

---
 cxx/CMakeLists.txt            | 4 +++-
 cxx/include/aesnixx/error.hpp | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cxx')

diff --git a/cxx/CMakeLists.txt b/cxx/CMakeLists.txt
index 14b7700..71173b5 100644
--- a/cxx/CMakeLists.txt
+++ b/cxx/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(Boost REQUIRED)
+
 add_library(libaesnixx INTERFACE)
-target_include_directories(libaesnixx INTERFACE include/)
+target_include_directories(libaesnixx INTERFACE include/ ${Boost_INCLUDE_DIRS})
 target_link_libraries(libaesnixx INTERFACE libaesni)
diff --git a/cxx/include/aesnixx/error.hpp b/cxx/include/aesnixx/error.hpp
index 552f832..9118e97 100644
--- a/cxx/include/aesnixx/error.hpp
+++ b/cxx/include/aesnixx/error.hpp
@@ -12,6 +12,8 @@
 
 #include <aesni/all.h>
 
+#include <boost/config.hpp>
+
 #include <cstdlib>
 #include <cstring>
 
@@ -80,11 +82,7 @@ namespace aesni
             aesni_success(get());
         }
 
-        #if defined(_MSC_VER) && _MSC_VER < 1900
-        ~ErrorDetailsThrowsInDestructor()
-        #else
-        ~ErrorDetailsThrowsInDestructor() noexcept(false)
-        #endif
+        ~ErrorDetailsThrowsInDestructor() BOOST_NOEXCEPT_IF(false)
         {
             if (aesni_is_error(aesni_get_error_code(get())))
                 throw Error(impl);
-- 
cgit v1.2.3