bind1st/bind2nd common name workaround

[SVN r18859]

preprocessed/include/bcc/user.hpp

@@ -2,6 +2,10 @@
 
 #include "boost/preprocessor/config/config.hpp"
 
-#define BOOST_NO_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
 #define BOOST_NO_TEMPLATE_TEMPLATES
-#define __BORLANDC__ 0x561
+#define BOOST_MPL_NO_BIND_TEMPLATE
+#define BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION
+#define BOOST_NO_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
+#define BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING

preprocessed/include/bcc551/user.hpp

@@ -2,6 +2,9 @@
 
 #include "boost/preprocessor/config/config.hpp"
 
-#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
 #define BOOST_NO_TEMPLATE_TEMPLATES
-#define __BORLANDC__ 0x551
+#define BOOST_MPL_NO_BIND_TEMPLATE
+#define BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION
+#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
+#define BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING

preprocessed/include/msvc60/user.hpp

@@ -6,3 +6,4 @@
 #define BOOST_NO_CV_VOID_SPECIALIZATIONS
 #define BOOST_NO_INTRINSIC_WCHAR_T
 #define BOOST_NO_STD_ALLOCATOR
+#define BOOST_MPL_NO_BIND_TEMPLATE

preprocessed/include/msvc70/user.hpp

@@ -2,3 +2,4 @@
 #define BOOST_MSVC 1300
 #define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+#define BOOST_MPL_NO_BIND_TEMPLATE

preprocessed/pp.py

@@ -159,6 +159,7 @@ class pretty:
         self.re_typedefs = re.compile(r'(\s*)((\s*typedef\s*.*?;)+)\s*$')
         self.re_closing_curly_brace = re.compile(r'^(}|struct\s+\w+);\s*$')
         self.re_namespace_scope_templ = re.compile(r'^template\s*<\s*$')
+        self.re_namespace = re.compile(r'^\n?namespace\s+\w+\s*{\s*\n?$')
 
     def process(self, line):
 
@@ -184,7 +185,10 @@ class pretty:
         # restoring some empty lines
         if self.re_templ_decl.match(line) and self.re_typedef.match(self.prev_line) \
            or not self.re_empty_line.match(line) and self.re_closing_curly_brace.match(self.prev_line) \
-           or self.re_namespace_scope_templ.match(line) and not self.re_empty_line.match(self.prev_line):
+           or not self.re_empty_line.match(self.prev_line) \
+              and ( self.re_namespace_scope_templ.match(line) \
+                    or self.re_namespace.match(line) and not self.re_namespace.match(self.prev_line) \
+                    ):
             line = '\n%s' % line
 
         # removing excessive empty lines

preprocessed/preprocess.py

@@ -1,16 +1,16 @@
 
-# Copyright (c) 2001-03
-# Aleksey Gurtovoy
+#  Copyright (c) 2001-03
+#  Aleksey Gurtovoy
 #
-# Permission to use, copy, modify, distribute and sell this software
-# and its documentation for any purpose is hereby granted without fee, 
-# provided that the above copyright notice appears in all copies and 
-# that both the copyright notice and this permission notice appear in 
-# supporting documentation. No representations are made about the 
-# suitability of this software for any purpose. It is provided "as is" 
-# without express or implied warranty.
+#  Permission to use, copy, modify, distribute and sell this software
+#  and its documentation for any purpose is hereby granted without fee, 
+#  provided that the above copyright notice appears in all copies and 
+#  that both the copyright notice and this permission notice appear in 
+#  supporting documentation. No representations are made about the 
+#  suitability of this software for any purpose. It is provided "as is" 
+#  without express or implied warranty.
 #
-# See http://www.boost.org/libs/mpl for documentation.
+#  See http://www.boost.org/libs/mpl for documentation.
 
 import shutil
 import os.path