Legacy macros, protected iterator, typedefs

Lib/java/std_unordered_set.i

@@ -134,6 +134,7 @@ class unordered_set {
   public:
 
     struct iterator {
+      %typemap(javaclassmodifiers) iterator "protected class"
       %extend {
         void incrementUnchecked() {
           ++(*$self);
@@ -149,6 +150,11 @@ class unordered_set {
       }
     };
 
+    typedef KeyType key_type;
+    typedef KeyType value_type;
+    typedef size_t size_type;
+    typedef ptrdiff_t difference_type;
+
     unordered_set();
     unordered_set(const unordered_set<KeyType>&);