1 files changed, 9 insertions, 22 deletions
diff --git a/boost/serialization/serialization.hpp b/boost/serialization/serialization.hpp
index 8462b594c8..a4d04723c7 100644
--- a/boost/serialization/serialization.hpp
+++ b/boost/serialization/serialization.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/config.hpp>
 #include <boost/serialization/strong_typedef.hpp>
-#include <boost/serialization/pfto.hpp>
 
 /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
 // serialization.hpp: interface for serialization system.
@@ -64,7 +63,7 @@ BOOST_STRONG_TYPEDEF(unsigned int, version_type)
 // default implementation - call the member function "serialize"
 template<class Archive, class T>
 inline void serialize(
-    Archive & ar, T & t, const BOOST_PFTO unsigned int file_version
+    Archive & ar, T & t, const unsigned int file_version
 ){
     access::serialize(ar, t, static_cast<unsigned int>(file_version));
 }
@@ -74,7 +73,7 @@ template<class Archive, class T>
 inline void save_construct_data(
     Archive & /*ar*/, 
     const T * /*t*/, 
-    const BOOST_PFTO unsigned int /*file_version */
+    const unsigned int /*file_version */
 ){
     // default is to save no data because default constructor
     // requires no arguments.
@@ -85,7 +84,7 @@ template<class Archive, class T>
 inline void load_construct_data(
     Archive & /*ar*/, 
     T * t, 
-    const BOOST_PFTO unsigned int /*file_version*/
+    const unsigned int /*file_version*/
 ){
     // default just uses the default constructor.  going
     // through access permits usage of otherwise private default
@@ -123,12 +122,8 @@ inline void serialize_adl(
     // Note that this trick generates problems for compiles which don't support
     // PFTO, suppress it here.  As far as we know, there are no compilers
     // which fail to support PFTO while supporting two-phase lookup.
-    #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        const version_type v(file_version);
-        serialize(ar, t, v);
-    #else
-        serialize(ar, t, file_version);
-    #endif
+    const version_type v(file_version);
+    serialize(ar, t, v);
 }
 
 template<class Archive, class T>
@@ -138,12 +133,8 @@ inline void save_construct_data_adl(
     const unsigned int file_version
 ){
     // see above
-    #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        const version_type v(file_version);
-        save_construct_data(ar, t, v);
-    #else
-        save_construct_data(ar, t, file_version);
-    #endif
+    const version_type v(file_version);
+    save_construct_data(ar, t, v);
 }
 
 template<class Archive, class T>
@@ -153,12 +144,8 @@ inline void load_construct_data_adl(
     const unsigned int file_version
 ){
     // see above comment
-    #if ! defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-        const version_type v(file_version);
-        load_construct_data(ar, t, v);
-    #else
-        load_construct_data(ar, t, file_version);
-    #endif
+    const version_type v(file_version);
+    load_construct_data(ar, t, v);
 }
 
 } // namespace serialization