Merge branch 'runtime_cast' into runtime_cast_test_fixes

apolukhin · Sep 30, 2016 · d6ca24f · d6ca24f
2 parents 045ab1d + 4459af9
commit d6ca24f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/boost/type_index/runtime_cast/detail/runtime_cast_impl.hpp b/include/boost/type_index/runtime_cast/detail/runtime_cast_impl.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_TYPE_INDEX_RUNTIME_CAST_DETAIL_RUNTIME_CAST_IMPL_HPP
 #define BOOST_TYPE_INDEX_RUNTIME_CAST_DETAIL_RUNTIME_CAST_IMPL_HPP
 
-/// \file pointer_class.hpp
+/// \file runtime_cast_impl.hpp
 /// \brief Contains the overload of boost::typeindex::runtime_cast for
 /// pointer types.
 ///

diff --git a/test/type_index_runtime_cast_test.cpp b/test/type_index_runtime_cast_test.cpp
@@ -233,8 +233,8 @@ void diamond_non_virtual()
     level1_a* l1a = &inst;
     base* b1 = l1a;
     level1_b* l1_b = runtime_cast<level1_b*>(b1);
-    BOOST_TEST_EQ(l1_b->name, "level1_b");
     BOOST_TEST_NE(l1_b, (level1_b*)NULL);
+    BOOST_TEST_EQ(l1_b->name, "level1_b");
 }
 
 void boost_shared_ptr()
@@ -249,12 +249,14 @@ void boost_shared_ptr()
 
 void std_shared_ptr()
 {
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
     using namespace boost::typeindex;
     std::shared_ptr<single_derived> d = std::make_shared<single_derived>();
     std::shared_ptr<base> b = d;
     std::shared_ptr<single_derived> d2 = runtime_pointer_cast<single_derived>(b);
     BOOST_TEST_NE(d2, std::shared_ptr<single_derived>());
     BOOST_TEST_EQ(d2->name, "single_derived");
+#endif
 }
 
 int main() {