From dc34c39c533b76bf5d8fd13e47906f6a4de16800 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 14 Feb 2019 08:16:16 +0000
Subject: [PATCH] Cosmetic STL typedef changes

---
 Lib/java/std_set.i               | 4 ++--
 Lib/java/std_unordered_set.i     | 4 ++--
 Lib/std/std_multimap.i           | 1 -
 Lib/std/std_unordered_map.i      | 1 -
 Lib/std/std_unordered_multimap.i | 1 -
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Lib/java/std_set.i b/Lib/java/std_set.i
index 4453d90bd..ddc0379cd 100644
--- a/Lib/java/std_set.i
+++ b/Lib/java/std_set.i
@@ -150,10 +150,10 @@ class set {
       }
     };
 
-    typedef T key_type;
-    typedef T value_type;
     typedef size_t size_type;
     typedef ptrdiff_t difference_type;
+    typedef T value_type;
+    typedef T key_type;
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/java/std_unordered_set.i b/Lib/java/std_unordered_set.i
index 06c7a1123..98bf3ebf1 100644
--- a/Lib/java/std_unordered_set.i
+++ b/Lib/java/std_unordered_set.i
@@ -150,10 +150,10 @@ class unordered_set {
       }
     };
 
-    typedef T key_type;
-    typedef T value_type;
     typedef size_t size_type;
     typedef ptrdiff_t difference_type;
+    typedef T value_type;
+    typedef T key_type;
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/std/std_multimap.i b/Lib/std/std_multimap.i
index 983a5d8fd..03e765341 100644
--- a/Lib/std/std_multimap.i
+++ b/Lib/std/std_multimap.i
@@ -50,7 +50,6 @@ namespace std {
     typedef _Key key_type;
     typedef _Tp mapped_type;
     typedef std::pair< const _Key, _Tp > value_type;
-
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/std/std_unordered_map.i b/Lib/std/std_unordered_map.i
index 0d6986497..723c0232d 100644
--- a/Lib/std/std_unordered_map.i
+++ b/Lib/std/std_unordered_map.i
@@ -71,7 +71,6 @@ namespace std {
     typedef _Key key_type;
     typedef _Tp mapped_type;
     typedef std::pair< const _Key, _Tp > value_type;
-
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;
diff --git a/Lib/std/std_unordered_multimap.i b/Lib/std/std_unordered_multimap.i
index 6f1be9cfa..f2855343d 100644
--- a/Lib/std/std_unordered_multimap.i
+++ b/Lib/std/std_unordered_multimap.i
@@ -49,7 +49,6 @@ namespace std {
     typedef _Key key_type;
     typedef _Tp mapped_type;
     typedef std::pair< const _Key, _Tp > value_type;
-
     typedef value_type* pointer;
     typedef const value_type* const_pointer;
     typedef value_type& reference;