Move unordered containers under cpp11_ prefix

This commit is contained in:
Brad Kotsopoulos 2018-11-28 16:51:53 -05:00
commit b1697d7772
5 changed files with 10 additions and 12 deletions

View file

@ -2,11 +2,10 @@
* A test of unordered_map containers. * A test of unordered_map containers.
*/ */
%module li_std_unordered_map %module cpp11_li_std_unordered_map
%include <std_string.i> %include <std_string.i>
%include <std_unordered_map.i> %include <std_unordered_map.i>
%template(IntIntUnorderedMap) std::unordered_map<int, int>; %template(IntIntUnorderedMap) std::unordered_map<int, int>;
%template(StringIntUnorderedMap) std::unordered_map<std::string, int>; %template(StringIntUnorderedMap) std::unordered_map<std::string, int>;

View file

@ -2,10 +2,9 @@
* A test of unordered_set containers. * A test of unordered_set containers.
*/ */
%module li_std_unordered_set %module cpp11_li_std_unordered_set
%include <std_string.i> %include <std_string.i>
%include <std_unordered_set.i> %include <std_unordered_set.i>
%template(StringUnorderedSet) std::unordered_set<std::string>; %template(StringUnorderedSet) std::unordered_set<std::string>;

View file

@ -54,8 +54,8 @@ CPP11_TEST_CASES = \
cpp11_shared_ptr_overload \ cpp11_shared_ptr_overload \
cpp11_shared_ptr_upcast \ cpp11_shared_ptr_upcast \
cpp11_strongly_typed_enumerations_simple \ cpp11_strongly_typed_enumerations_simple \
li_std_unordered_map \ cpp11_li_std_unordered_map \
li_std_unordered_set \ cpp11_li_std_unordered_set \
DOXYGEN_TEST_CASES := \ DOXYGEN_TEST_CASES := \
doxygen_parsing_enums_simple \ doxygen_parsing_enums_simple \

View file

@ -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 { static {
try { try {
System.loadLibrary("li_std_unordered_map"); System.loadLibrary("cpp11_li_std_unordered_map");
} catch (UnsatisfiedLinkError e) { } 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.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); System.exit(1);

View file

@ -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 { static {
try { try {
System.loadLibrary("li_std_unordered_set"); System.loadLibrary("cpp11_li_std_unordered_set");
} catch (UnsatisfiedLinkError e) { } 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.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); System.exit(1);