--- old/src/jdk.jpackage/share/native/libapplauncher/OrderedMap.h	2019-02-15 18:09:20.334145500 -0800
+++ new/src/jdk.jpackage/share/native/libapplauncher/OrderedMap.h	2019-02-15 18:09:18.447956900 -0800
@@ -26,10 +26,6 @@
 #ifndef ORDEREDMAP_H
 #define ORDEREDMAP_H
 
-#ifdef WINDOWS
-#pragma warning(disable:4522)
-#endif
-
 #include <map>
 #include <vector>
 #include <assert.h>
@@ -37,9 +33,8 @@
 
 #include <iostream>
 
-
 template <typename _T1, typename _T2>
-struct pair
+struct JPPair
 {
     typedef _T1 first_type;
     typedef _T2 second_type;
@@ -47,7 +42,7 @@
     first_type first;
     second_type second;
 
-    pair(first_type Value1, second_type Value2) {
+    JPPair(first_type Value1, second_type Value2) {
         first = Value1;
         second = Value2;
     }
@@ -59,7 +54,7 @@
 public:
     typedef TKey key_type;
     typedef TValue mapped_type;
-    typedef pair<key_type, mapped_type> container_type;
+    typedef JPPair<key_type, mapped_type> container_type;
     typedef typename std::vector<container_type*>::iterator iterator;
     typedef typename std::vector<container_type*>::const_iterator const_iterator;
 
@@ -234,12 +229,6 @@
         Clear();
         Append(Value);
         return *this;
-    }
-
-    OrderedMap& operator= (const OrderedMap &Value) {
-        Clear();
-        Append(Value);
-        return *this;
     }
 
     size_t Count() {