diff options
author | jkim <jkim@FreeBSD.org> | 2015-01-15 08:26:39 +0800 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-01-15 08:26:39 +0800 |
commit | 6b6102daae0f60ba2c79e7e7161bc1d7a37a1546 (patch) | |
tree | 427a31e6e774c23937e2e21887af0a09aba50f11 /java/cacao | |
parent | 791c40eb83af9072637dd3c565aaaa2528577903 (diff) | |
download | freebsd-ports-gnome-6b6102daae0f60ba2c79e7e7161bc1d7a37a1546.tar.gz freebsd-ports-gnome-6b6102daae0f60ba2c79e7e7161bc1d7a37a1546.tar.zst freebsd-ports-gnome-6b6102daae0f60ba2c79e7e7161bc1d7a37a1546.zip |
Fix build with libc++ on 10.0.
MFH: 2015Q1
Diffstat (limited to 'java/cacao')
-rw-r--r-- | java/cacao/files/patch-src__vm__properties.cpp | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/java/cacao/files/patch-src__vm__properties.cpp b/java/cacao/files/patch-src__vm__properties.cpp index c15c0a01bf84..0421d2403a79 100644 --- a/java/cacao/files/patch-src__vm__properties.cpp +++ b/java/cacao/files/patch-src__vm__properties.cpp @@ -1,6 +1,6 @@ ---- src/vm/properties.cpp.orig 2012-09-03 12:10:00.000000000 -0400 -+++ src/vm/properties.cpp 2012-10-04 14:34:15.000000000 -0400 -@@ -74,7 +74,11 @@ +--- src/vm/properties.cpp.orig 2013-06-28 09:22:27.000000000 -0400 ++++ src/vm/properties.cpp 2015-01-14 19:18:40.000000000 -0500 +@@ -76,7 +76,11 @@ p = MNEW(char, 4096); @@ -12,3 +12,39 @@ os::abort_errno("readlink failed"); /* We have a path like: +@@ -561,7 +565,7 @@ + void Properties::put(const char* key, const char* value) + { + // Try to find the key. +- std::map<const char*, const char*>::iterator it = _properties.find(key); ++ std::map<const char*, const char*, ltstr>::iterator it = _properties.find(key); + + // The key is already in the map. + if (it != _properties.end()) { +@@ -590,7 +594,7 @@ + const char* Properties::get(const char* key) + { + // Try to find the key. +- std::map<const char*, const char*>::iterator it = _properties.find(key); ++ std::map<const char*, const char*, ltstr>::iterator it = _properties.find(key); + + // The key is not in the map. + if (it == _properties.end()) +@@ -624,7 +628,7 @@ + return; + + // Iterator over all properties. +- for (std::map<const char*, const char*>::iterator it = _properties.begin(); it != _properties.end(); it++) { ++ for (std::map<const char*, const char*, ltstr>::iterator it = _properties.begin(); it != _properties.end(); it++) { + // Put into the Java system properties. + java_handle_t* key = JavaString::from_utf8(it->first); + java_handle_t* value = JavaString::from_utf8(it->second); +@@ -641,7 +645,7 @@ + #if !defined(NDEBUG) + void Properties::dump() + { +- for (std::map<const char*, const char*>::iterator it = _properties.begin(); it != _properties.end(); it++) { ++ for (std::map<const char*, const char*, ltstr>::iterator it = _properties.begin(); it != _properties.end(); it++) { + log_println("[Properties::dump: key=%s, value=%s]", it->first, it->second); + } + } |