Work with gcc2

dabrahams · dabrahams · commit fba93805dcfb · 2003-09-23T23:57:23.000Z
[SVN r20168]
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
@@ -280,6 +280,8 @@ namespace
   }
   unaryfunc py_encode_string = encode_string_unaryfunc;
 
+
+#ifndef BOOST_NO_STD_WSTRING
   // A SlotPolicy for extracting C++ strings from Python objects.
   struct wstring_rvalue_from_python
   {
@@ -307,6 +309,7 @@ namespace
           return result;
       }
   };
+#endif 
 
   struct complex_rvalue_from_python
   {
@@ -402,8 +405,10 @@ void initialize_builtin_converters()
     // Add an lvalue converter for char which gets us char const*
     registry::insert(convert_to_cstring,type_id<char>());
 
+# ifndef BOOST_NO_STD_WSTRING
     // Register by-value converters to std::string, std::wstring
     slot_rvalue_from_python<std::wstring, wstring_rvalue_from_python>();
+# endif 
     slot_rvalue_from_python<std::string, string_rvalue_from_python>();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -280,6 +280,8 @@ namespace`
`280`	`280`	`}`
`281`	`281`	`unaryfunc py_encode_string = encode_string_unaryfunc;`
`282`	`282`
	`283`	`+`
	`284`	`+#ifndef BOOST_NO_STD_WSTRING`
`283`	`285`	`// A SlotPolicy for extracting C++ strings from Python objects.`
`284`	`286`	`struct wstring_rvalue_from_python`
`285`	`287`	`{`
`@@ -307,6 +309,7 @@ namespace`
`307`	`309`	`return result;`
`308`	`310`	`}`
`309`	`311`	`};`
	`312`	`+#endif`
`310`	`313`
`311`	`314`	`struct complex_rvalue_from_python`
`312`	`315`	`{`
`@@ -402,8 +405,10 @@ void initialize_builtin_converters()`
`402`	`405`	`// Add an lvalue converter for char which gets us char const*`
`403`	`406`	`registry::insert(convert_to_cstring,type_id<char>());`
`404`	`407`
	`408`	`+# ifndef BOOST_NO_STD_WSTRING`
`405`	`409`	`// Register by-value converters to std::string, std::wstring`
`406`	`410`	`slot_rvalue_from_python<std::wstring, wstring_rvalue_from_python>();`
	`411`	`+# endif`
`407`	`412`	`slot_rvalue_from_python<std::string, string_rvalue_from_python>();`
`408`	`413`	`}`
`409`	`414`