From e2c227d4aaade5e5069bab0abf2f2d4520619bcd Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Wed, 21 May 2014 10:47:30 +0400
Subject: [PATCH] Fix a typo and improve macro definitionas in Jamfile

---
 test/Jamfile.v2          | 20 +++++++++++---------
 test/type_index_test.cpp |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 75f710c..9c96485 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,14 +13,16 @@ compat = <define>BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY ;
 
 # Making own `nortti` that is link compatible.
 # We explicitly define BOOST_NO_RTTI because it sometimes can not be detected by build system.
-nortti = <toolset>gcc:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>clang:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>intel:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>msvc:<cxxflags>/GR- ;
+nortti = <toolset>gcc:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>clang:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID" <toolset>intel:"<cxxflags>-fno-rtti -DBOOST_NO_RTTI" <toolset>msvc:<cxxflags>/GR- ;
+
+norttidefines = <toolset>gcc:"<cxxflags>-DBOOST_NO_RTTI -DBOOST_NO_TYPEID" <toolset>clang:"<cxxflags>-DBOOST_NO_RTTI -DBOOST_NO_TYPEID" <toolset>intel:"<cxxflags>-DBOOST_NO_RTTI -DBOOST_NO_TYPEID" <toolset>msvc:<cxxflags>-DBOOST_NO_RTTI ;
 
 
 # Making libraries that CANNOT work between rtti-on/rtti-off modules
-obj test_lib_nortti-obj : test_lib.cpp : <link>shared <rtti>off <cxxflags>-DBOOST_NO_RTTI ;
-obj test_lib_anonymous_nortti-obj : test_lib_anonymous.cpp : <link>shared <rtti>off <cxxflags>-DBOOST_NO_RTTI ;
-lib test_lib_nortti : test_lib_nortti-obj : <link>shared <rtti>off <cxxflags>-DBOOST_NO_RTTI ;
-lib test_lib_anonymous_nortti : test_lib_anonymous_nortti-obj : <link>shared <rtti>off <cxxflags>-DBOOST_NO_RTTI ;
+obj test_lib_nortti-obj : test_lib.cpp : <link>shared <rtti>off $(norttidefines) ;
+obj test_lib_anonymous_nortti-obj : test_lib_anonymous.cpp : <link>shared <rtti>off $(norttidefines) ;
+lib test_lib_nortti : test_lib_nortti-obj : <link>shared <rtti>off $(norttidefines) ;
+lib test_lib_anonymous_nortti : test_lib_anonymous_nortti-obj : <link>shared <rtti>off $(norttidefines) ;
 
 obj test_lib_rtti-obj : test_lib.cpp : <link>shared ;
 obj test_lib_anonymous_rtti-obj : test_lib_anonymous.cpp : <link>shared ;
@@ -37,12 +39,12 @@ lib test_lib_rtti_compat : test_lib_rtti_compat-obj : <link>shared $(nortti) $(c
 test-suite type_index
   : 
     [ run type_index_test.cpp ]
-    [ run type_index_test.cpp : : : <rtti>off <cxxflags>-DBOOST_NO_RTTI : type_index_test_no_rtti ]
+    [ run type_index_test.cpp : : : <rtti>off $(norttidefines) : type_index_test_no_rtti ]
     [ run ctti_print_name.cpp : : : <test-info>always_show_run_output ]
     [ run testing_crossmodule.cpp test_lib_rtti ]
-    [ run testing_crossmodule.cpp test_lib_nortti : : : <rtti>off <cxxflags>-DBOOST_NO_RTTI : testing_crossmodule_no_rtti ]
+    [ run testing_crossmodule.cpp test_lib_nortti : : : <rtti>off $(norttidefines) : testing_crossmodule_no_rtti ]
     [ run testing_crossmodule_anonymous.cpp test_lib_anonymous_rtti ]
-    [ run testing_crossmodule_anonymous.cpp test_lib_anonymous_nortti : : : <rtti>off <cxxflags>-DBOOST_NO_RTTI : testing_crossmodule_anonymous_no_rtti ]
+    [ run testing_crossmodule_anonymous.cpp test_lib_anonymous_nortti : : : <rtti>off $(norttidefines) : testing_crossmodule_anonymous_no_rtti ]
     [ compile-fail type_index_test_ctti_copy_fail.cpp ]
     [ compile-fail type_index_test_ctti_construct_fail.cpp ]
     [ compile type_index_test_ctti_alignment.cpp ]
@@ -65,7 +67,7 @@ for local p in [ glob ../examples/*.cpp ]
     local target_name = $(p[1]:B)_no_rtti ;
     if $(target_name) != "table_of_names_no_rtti"
     {
-        type_index += [ run $(p) : : : <rtti>off <cxxflags>-DBOOST_NO_RTTI : $(target_name) ] ;
+        type_index += [ run $(p) : : : <rtti>off $(norttidefines) : $(target_name) ] ;
     }
 }
 
diff --git a/test/type_index_test.cpp b/test/type_index_test.cpp
index 919f395..ab20c22 100644
--- a/test/type_index_test.cpp
+++ b/test/type_index_test.cpp
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(names_matches_type_id)
     BOOST_CHECK_EQUAL(type_id<int>().pretty_name(), "int");
     BOOST_CHECK_EQUAL(type_id<double>().pretty_name(), "double");
 
-    BOOST_CHECK_NE(type_id<int>().name(),    type_id<int>().name());
+    BOOST_CHECK_EQUAL(type_id<int>().name(),    type_id<int>().name());
     BOOST_CHECK_NE(type_id<int>().name(),       type_id<double>().name());
     BOOST_CHECK_NE(type_id<double>().name(),    type_id<int>().name());
     BOOST_CHECK_EQUAL(type_id<double>().name(), type_id<double>().name());