From b1697d7772e2b96367b0a73a756106ed96295190 Mon Sep 17 00:00:00 2001
From: Brad Kotsopoulos <bkotsopoulos@snapchat.com>
Date: Wed, 28 Nov 2018 16:51:53 -0500
Subject: [PATCH] Move unordered containers under cpp11_ prefix

---
 ...{li_std_unordered_map.i => cpp11_li_std_unordered_map.i} | 3 +--
 ...{li_std_unordered_set.i => cpp11_li_std_unordered_set.i} | 3 +--
 Examples/test-suite/java/Makefile.in                        | 4 ++--
 ...map_runme.java => cpp11_li_std_unordered_map_runme.java} | 6 +++---
 ...set_runme.java => cpp11_li_std_unordered_set_runme.java} | 6 +++---
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename Examples/test-suite/{li_std_unordered_map.i => cpp11_li_std_unordered_map.i} (87%)
 rename Examples/test-suite/{li_std_unordered_set.i => cpp11_li_std_unordered_set.i} (82%)
 rename Examples/test-suite/java/{li_std_unordered_map_runme.java => cpp11_li_std_unordered_map_runme.java} (95%)
 rename Examples/test-suite/java/{li_std_unordered_set_runme.java => cpp11_li_std_unordered_set_runme.java} (91%)

diff --git a/Examples/test-suite/li_std_unordered_map.i b/Examples/test-suite/cpp11_li_std_unordered_map.i
similarity index 87%
rename from Examples/test-suite/li_std_unordered_map.i
rename to Examples/test-suite/cpp11_li_std_unordered_map.i
index a6869cc0b..5f40e76fd 100644
--- a/Examples/test-suite/li_std_unordered_map.i
+++ b/Examples/test-suite/cpp11_li_std_unordered_map.i
@@ -2,11 +2,10 @@
  * A test of unordered_map containers.
  */
 
-%module li_std_unordered_map
+%module cpp11_li_std_unordered_map
 
 %include <std_string.i>
 %include <std_unordered_map.i>
 
 %template(IntIntUnorderedMap) std::unordered_map<int, int>;
 %template(StringIntUnorderedMap) std::unordered_map<std::string, int>;
-
diff --git a/Examples/test-suite/li_std_unordered_set.i b/Examples/test-suite/cpp11_li_std_unordered_set.i
similarity index 82%
rename from Examples/test-suite/li_std_unordered_set.i
rename to Examples/test-suite/cpp11_li_std_unordered_set.i
index a051e9389..e9711ce60 100644
--- a/Examples/test-suite/li_std_unordered_set.i
+++ b/Examples/test-suite/cpp11_li_std_unordered_set.i
@@ -2,10 +2,9 @@
  * A test of unordered_set containers.
  */
 
-%module li_std_unordered_set
+%module cpp11_li_std_unordered_set
 
 %include <std_string.i>
 %include <std_unordered_set.i>
 
 %template(StringUnorderedSet) std::unordered_set<std::string>;
-
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index b5b1d65c7..3323f8a9c 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -54,8 +54,8 @@ CPP11_TEST_CASES = \
 	cpp11_shared_ptr_overload \
 	cpp11_shared_ptr_upcast \
 	cpp11_strongly_typed_enumerations_simple \
-	li_std_unordered_map \
-	li_std_unordered_set \
+	cpp11_li_std_unordered_map \
+	cpp11_li_std_unordered_set \
 
 DOXYGEN_TEST_CASES := \
 	doxygen_parsing_enums_simple \
diff --git a/Examples/test-suite/java/li_std_unordered_map_runme.java b/Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java
similarity index 95%
rename from Examples/test-suite/java/li_std_unordered_map_runme.java
rename to Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java
index 8ab6f23e4..f216a0131 100644
--- a/Examples/test-suite/java/li_std_unordered_map_runme.java
+++ b/Examples/test-suite/java/cpp11_li_std_unordered_map_runme.java
@@ -1,10 +1,10 @@
-import li_std_unordered_map.*;
+import cpp11_li_std_unordered_map.*;
 
-public class li_std_unordered_map_runme {
+public class cpp11_li_std_unordered_map_runme {
 
   static {
     try {
-      System.loadLibrary("li_std_unordered_map");
+      System.loadLibrary("cpp11_li_std_unordered_map");
     } catch (UnsatisfiedLinkError e) {
       System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
       System.exit(1);
diff --git a/Examples/test-suite/java/li_std_unordered_set_runme.java b/Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java
similarity index 91%
rename from Examples/test-suite/java/li_std_unordered_set_runme.java
rename to Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java
index ce94f8fe4..ce33780f0 100644
--- a/Examples/test-suite/java/li_std_unordered_set_runme.java
+++ b/Examples/test-suite/java/cpp11_li_std_unordered_set_runme.java
@@ -1,10 +1,10 @@
-import li_std_unordered_set.*;
+import cpp11_li_std_unordered_set.*;
 
-public class li_std_unordered_set_runme {
+public class cpp11_li_std_unordered_set_runme {
 
   static {
     try {
-      System.loadLibrary("li_std_unordered_set");
+      System.loadLibrary("cpp11_li_std_unordered_set");
     } catch (UnsatisfiedLinkError e) {
       System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
       System.exit(1);