Rename construction macros in std containers

Author: sethrj

Lib/fortran/std_multiset.i

@@ -7,10 +7,14 @@
 
 %include "std_set.i"
 
+%define %swig_std_multiset(_Key, _Compare, _Alloc)
+  %swig_std_setcommon(multiset, _Key, _Compare, _Alloc)
+%enddef
+
 namespace std {
 template<class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> >
 class multiset {
-  SWIG_STD_SET_COMMON(multiset, _Key, _Compare, _Alloc)
+  %swig_std_multiset( _Key, _Compare, _Alloc)
 };
 } // end namespace std
 

Lib/fortran/std_set.i

@@ -8,7 +8,8 @@
 #include <set>
 %}
 
-%define SWIG_STD_SET_COMMON(CLASS, _Key, _Compare, _Alloc)
+// methods used by both set *and* multiset
+%define %swig_std_setcommon(CLASS, _Key, _Compare, _Alloc)
 
 public:
   // Typedefs
@@ -37,13 +38,16 @@ public:
   size_type erase(const key_type& x);
   size_type count(const key_type& x) const;
   void insert(const_reference x);
+%enddef
 
+%define %swig_std_set(_Key, _Compare, _Alloc)
+  %swig_std_setcommon(set, _Key, _Compare, _Alloc)
 %enddef
 
 namespace std {
 template<class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> >
 class set {
-  SWIG_STD_SET_COMMON(set, _Key, _Compare, _Alloc)
+  %swig_std_set(_Key, _Compare, _Alloc)
 };
 } // end namespace std
 

Lib/fortran/std_vector.i

@@ -20,7 +20,7 @@
 #include <vector>
 %}
 
-%define SWIG_STD_VECTOR_COMMON(CTYPE, CREF_TYPE)
+%define %swig_std_vector(CTYPE, CREF_TYPE)
   public:
     // Typedefs
     typedef size_t size_type;
@@ -109,7 +109,7 @@
     }
 %enddef
 
-%define SWIG_STD_VECTOR_REF(CTYPE)
+%define %swig_std_vector_extend_ref(CTYPE)
   %extend {
     CTYPE& front_ref() {
       return (*$self).front();
@@ -128,13 +128,13 @@
 
 namespace std {
   template<class T> class vector {
-    SWIG_STD_VECTOR_COMMON(T, const T&)
-    SWIG_STD_VECTOR_REF(T)
+    %swig_std_vector(T, const T&)
+    %swig_std_vector_extend_ref(T)
   };
 
   // bool specialization
   template<> class vector<bool> {
-    SWIG_STD_VECTOR_COMMON(bool, bool)
+    %swig_std_vector(bool, bool)
   };
 } // end namespace std