fixes for latest stl changes

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6383 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/primitive_types.i

@@ -148,8 +148,8 @@
 //
 %apply const int& { const Hello&  };
 
-%apply long { pint };
-%apply const long& { const pint& };
+%apply void* { pint };
+%apply const void*& { const pint& };
   
 
 //
@@ -162,7 +162,7 @@
   typedef char namet[5];
   typedef char* pchar;
   typedef const char* pcharc;
-  typedef int* pint;
+  typedef char* pint;
 
   char* const def_pchar = (char *const)"hello";
   const char* const def_pcharc = "hija";

Examples/test-suite/python/complextest.i

@@ -39,6 +39,10 @@
 
 #else
 
+
+%{
+%}
+
 %inline 
 {
   complex Conj(complex a)
@@ -46,7 +50,8 @@
     return conj(a);
   }
 
-  float_complex Conjf(float_complex a)
+
+  complex float Conjf(float complex a)
   {
     return conj(a);
   }

Examples/test-suite/python/lib_std_map.i

@@ -1,9 +1,8 @@
 %module lib_std_map
 
-//#define SWIG_STD_EXTEND_COMPARISON
-///
 %include std_pair.i
 %include std_map.i
+%include std_multimap.i
 
 %inline %{
 struct A{
@@ -21,6 +20,7 @@ namespace std
   %template(pairii) pair<int, int>;
   %template(pairA) pair<int, A*>;
   %template(mapA) map<int, A*>;
+  %template(mmapA) multimap<int, A*>;
 
   %template(paircA1) pair<const int, A*>;
   %template(paircA2) pair<const int, const A*>;

Examples/test-suite/python/lib_std_pair.i

@@ -3,7 +3,6 @@
 //
 // activate the automatic comparison methods generation (==,!=,...) 
 //
-#define SWIG_STD_EXTEND_COMPARISON
 
 %include std_pair.i
 %include std_string.i
@@ -25,10 +24,11 @@
   };
 %}
 
+%std_comp_methods(std::pair<std::string, int>);
+
 namespace std {
   %template(CIntPair) pair<const int, const int>;
   %template() pair<double, double>;
-  %template(String) basic_string<char>;
   %template(IntPair) pair<int, int>;
   %template(SIPair) pair<std::string, int>;
   %template(CIPair) pair<std::complex<double>, int>;

Examples/test-suite/python/std_containers.i

@@ -1,10 +1,5 @@
 %module std_containers
 
-//
-// activate the automatic comparison methods generation (==,!=,...) 
-//
-#define SWIG_STD_EXTEND_COMPARISON
-
 %include std_vector.i
 %include std_string.i
 %include std_deque.i