cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r377060

Browse Source 
Fix build with libc++ on 10.0.

Approved by:	portmgr (antoine)
This commit is contained in:
Jung-uk Kim 2015-01-16 18:44:54 +00:00
parent 26804c9850
commit f4faff609d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2015Q1/; revision=377197
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
java/cacao/files/patch-src__vm__properties.cpp
View File

@ -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);
}
}