Author: hdu
Date: Mon Aug 19 06:47:14 2013
New Revision: 1515285
URL: http://svn.apache.org/r1515285
Log:
#i122208# use explicit hash functors for unordered_maps with non-standard types
in configmgr
This also fixes a problem in the FreeBSD port reported by Nakata Maho.
Modified:
openoffice/branches/rejuvenate01/main/configmgr/source/modifications.hxx
openoffice/branches/rejuvenate01/main/configmgr/source/partial.hxx
Modified:
openoffice/branches/rejuvenate01/main/configmgr/source/modifications.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configmgr/source/modifications.hxx?rev=1515285&r1=1515284&r2=1515285&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configmgr/source/modifications.hxx
(original)
+++ openoffice/branches/rejuvenate01/main/configmgr/source/modifications.hxx
Mon Aug 19 06:47:14 2013
@@ -38,7 +38,7 @@ namespace configmgr {
class Modifications: private boost::noncopyable {
public:
struct Node {
- typedef boost::unordered_map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash >
Children;
Children children;
};
Modified: openoffice/branches/rejuvenate01/main/configmgr/source/partial.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configmgr/source/partial.hxx?rev=1515285&r1=1515284&r2=1515285&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configmgr/source/partial.hxx
(original)
+++ openoffice/branches/rejuvenate01/main/configmgr/source/partial.hxx Mon Aug
19 06:47:14 2013
@@ -50,7 +50,7 @@ public:
private:
struct Node {
- typedef boost::unordered_map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash >
Children;
Node(): startInclude(false) {}
void clear() { startInclude=false; children.clear(); }
