Support for newer boost versions above 1.70 (#74)

ftsrg · Dec 30, 2020 · ebbffbc · ebbffbc
1 parent efa5936
commit ebbffbc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ add_definitions(${LLVM_DEFINITIONS})
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
 
 # Get boost
-find_package(Boost REQUIRED)
+find_package(Boost 1.70 REQUIRED)
 include_directories(${Boost_INCLUDE_DIR})
 
 add_definitions(-DBOOST_NO_RTTI -DBOOST_EXCEPTION_DISABLE -DBOOST_NO_EXCEPTIONS)

diff --git a/include/gazer/Core/Expr.h b/include/gazer/Core/Expr.h
@@ -338,6 +338,8 @@ struct simplify_type<const gazer::ExprRef<T>> {
 
 } // end namespace llvm
 
+#if BOOST_VERSION < 107400
+// Boost 1.74 introduced std::hash specialization for smart pointers, but we officially support 1.70.
 namespace std
 {
 
@@ -358,5 +360,6 @@ struct hash<gazer::ExprRef<T>>
 };
 
 } // end namespace std
+#endif
 
 #endif
diff --git a/src/Core/GazerContext.cpp b/src/Core/GazerContext.cpp
@@ -34,6 +34,13 @@ namespace boost
         #endif
         std::terminate();
     }
+
+    #if BOOST_VERSION >= 107300
+    void throw_exception(std::exception const &e, boost::source_location const&)
+    {
+        boost::throw_exception(e);
+    }
+    #endif
 } // end namespace boost
 #endif