Merge pull request #7553 from davidlange6/hack_boost_version2

add preprocessor check on boost version
cms-sw · Feb 4, 2015 · 77d3ff5 · 77d3ff5
2 parents 15b2c7b + 9d0402d
commit 77d3ff5
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/HLTrigger/HLTcore/interface/defaultModuleLabel.h b/HLTrigger/HLTcore/interface/defaultModuleLabel.h
@@ -5,12 +5,21 @@
 #include <string>
 
 // boost headers
+#include <boost/version.hpp>
+#if BOOST_VERSION < 105200
+#include <boost/units/detail/utility.hpp>
+#else
 #include <boost/core/demangle.hpp>
+#endif
 
 template <typename T>
 std::string defaultModuleLabel() {
   // start with the demangled name for T
+#if BOOST_VERSION < 105200
+  std::string name = boost::units::detail::demangle(typeid(T).name());
+#else
   std::string name = boost::core::demangle(typeid(T).name());
+#endif
 
   // expected size of the label
   unsigned int size = 0;