Merge branch 'vadz-java-map-comp'

* vadz-java-map-comp:
  Add support for std::map<> comparator template argument for Java

Conflicts:
	CHANGES.current

CHANGES.current

@@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
 Version 4.0.0 (in progress)
 ===========================
 
+2018-06-09: vadz
+            [Java] #1274 Allow exporting std::map using non-default comparison function.
+
 2018-10-04: wsfulton
             [Python] #1126 Fix C default arguments with -builtin and -fastunpack and -modernargs.
             Problem occurred when there is just one (defaulted) parameter in the parameter list.

Lib/java/std_map.i

@@ -18,21 +18,21 @@
 
 namespace std {
 
-  template<class K, class T> class map {
+  template<class K, class T, class C = std::less<K> > class map {
     public:
       typedef size_t size_type;
       typedef ptrdiff_t difference_type;
       typedef K key_type;
       typedef T mapped_type;
       map();
-      map(const map<K,T> &);
+      map(const map<K,T,C> &);
 
       unsigned int size() const;
       bool empty() const;
       void clear();
       %extend {
         const T& get(const K& key) throw (std::out_of_range) {
-          std::map<K,T >::iterator i = self->find(key);
+          std::map<K,T,C >::iterator i = self->find(key);
           if (i != self->end())
             return i->second;
           else
@@ -42,14 +42,14 @@ namespace std {
           (*self)[key] = x;
         }
         void del(const K& key) throw (std::out_of_range) {
-          std::map<K,T >::iterator i = self->find(key);
+          std::map<K,T,C >::iterator i = self->find(key);
           if (i != self->end())
             self->erase(i);
           else
             throw std::out_of_range("key not found");
         }
         bool has_key(const K& key) {
-          std::map<K,T >::iterator i = self->find(key);
+          std::map<K,T,C >::iterator i = self->find(key);
           return i != self->end();
         }
       }