removed TEMPLATE_X

[SVN r2498]

test/compliant/lambda/register.hpp

@@ -25,6 +25,6 @@ BOOST_TYPEOF_REGISTER_TYPE(boost::lambda::greater_action)
 BOOST_TYPEOF_REGISTER_TYPE(boost::lambda::less_action)
 BOOST_TYPEOF_REGISTER_TYPE(boost::lambda::and_action)
 BOOST_TYPEOF_REGISTER_TYPE(boost::lambda::subscript_action)
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(boost::lambda::placeholder, (int))
+BOOST_TYPEOF_REGISTER_TEMPLATE(boost::lambda::placeholder, (int))
 
 #endif//LAMBDA_REGISTER_HPP_INCLUDED

test/compliant/typeof.vcproj

@@ -134,12 +134,6 @@
 			</File>
 			<File
 				RelativePath=".\test_compliant.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						GeneratePreprocessedFile="0"/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -234,13 +228,6 @@
 				RelativePath=".\lambda\register.hpp">
 			</File>
 		</Filter>
-		<Filter
-			Name="stl"
-			Filter="">
-			<File
-				RelativePath="..\stl\register.hpp">
-			</File>
-		</Filter>
 		<Filter
 			Name="mpl"
 			Filter="">

test/compliant/typeof_g++.bat

@@ -1,3 +1,3 @@
+g++ -IC:\boost\boost_1_32_0 -I..\..\..\.. ..\main.cpp test_compliant.cpp odr1.cpp odr2.cpp
 g++ -IC:\boost\boost_1_32_0 -I..\..\..\.. -D BOOST_TYPEOF_COMPLIANT -D BOOST_TYPEOF_LIMIT_SIZE=50 -D BOOST_MPL_LIMIT_VECTOR_SIZE=50 test_compliant.cpp ..\main.cpp odr1.cpp odr2.cpp 
-g++ -IC:\boost\boost_1_32_0 -I..\..\..\.. odr1.cpp odr2.cpp test_compliant.cpp ..\main.cpp 
 

test/main.cpp

@@ -65,8 +65,15 @@ namespace template_template {
     struct C {};
 }
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(template_template::tt_test,(BOOST_TYPEOF_TEMPLATE( (typename)(unsigned int) ))(int))
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(template_template::C,(typename)(unsigned int))
+BOOST_TYPEOF_REGISTER_TEMPLATE(template_template::tt_test,
+                               (BOOST_TYPEOF_TEMPLATE((typename)(unsigned int)))
+                               (int)
+                               )
+
+BOOST_TYPEOF_REGISTER_TEMPLATE(template_template::C,
+                               (typename)
+                               (unsigned int)
+                               )
 
 BOOST_STATIC_ASSERT((typeof_test<template_template::tt_test<template_template::C,4> >::value));
 #endif 
@@ -100,7 +107,7 @@ template<class T, char c, unsigned short us,
     int i, unsigned long ul, bool b1, bool b2, signed char sc, unsigned u> struct with_integrals
 {};
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(with_integrals, 
+BOOST_TYPEOF_REGISTER_TEMPLATE(with_integrals, 
     (class)
     (char)
     (unsigned short)
@@ -249,18 +256,18 @@ namespace test_integral
     {};
 }
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(test_integral::foo, 
-                                 (BOOST_TYPEOF_INTEGRAL(test_integral::E))
-                                );
+BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::foo, 
+                               (BOOST_TYPEOF_INTEGRAL(test_integral::E))
+                               );
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(test_integral::blah, 
-                                (BOOST_TYPEOF_INTEGRAL(unsigned long int))
-                                );
+BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::blah, 
+                               (BOOST_TYPEOF_INTEGRAL(unsigned long int))
+                               );
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(test_integral::bar, 
-                                (class)
-                                (BOOST_TYPEOF_INTEGRAL(P0))
-                                );
+BOOST_TYPEOF_REGISTER_TEMPLATE(test_integral::bar,
+                               (class)
+                               (BOOST_TYPEOF_INTEGRAL(P0))
+                               );
 
 namespace test_integral
 {

test/stl/register.hpp

@@ -14,7 +14,7 @@
 
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
 
-BOOST_TYPEOF_REGISTER_TEMPLATE_X(std::vector, (class)(class))
+BOOST_TYPEOF_REGISTER_TEMPLATE(std::vector, (class)(class))
 BOOST_TYPEOF_REGISTER_TEMPLATE(std::list, 2)
 BOOST_TYPEOF_REGISTER_TEMPLATE(std::set, 3)
 BOOST_TYPEOF_REGISTER_TEMPLATE(std::allocator, 1)