Author: hdu
Date: Thu Dec 12 09:48:15 2013
New Revision: 1550388
URL: http://svn.apache.org/r1550388
Log:
#i122208# force boost *map for configmgr's Modifications Node structure
The C++ standards allows that the instantiation of incomplete types fails. The
Node structure had this problem because it contained a map of Node structures
itself. Boost containers explicitly allow recursive types so they solve that.
Modified:
openoffice/trunk/main/configmgr/source/modifications.hxx
Modified: openoffice/trunk/main/configmgr/source/modifications.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configmgr/source/modifications.hxx?rev=1550388&r1=1550387&r2=1550388&view=diff
==============================================================================
--- openoffice/trunk/main/configmgr/source/modifications.hxx (original)
+++ openoffice/trunk/main/configmgr/source/modifications.hxx Thu Dec 12
09:48:15 2013
@@ -26,20 +26,19 @@
#include "sal/config.h"
-#include <map>
+#include <boost/unordered_map.hpp> // using the boost container because it
explicitly allows recursive types
#include "boost/noncopyable.hpp"
#include "path.hxx"
-
-namespace rtl { class OUString; }
+#include "rtl/ustring.hxx"
namespace configmgr {
class Modifications: private boost::noncopyable {
public:
struct Node {
- typedef std::map< rtl::OUString, Node > Children;
+ typedef boost::unordered_map< rtl::OUString, Node, rtl::OUStringHash >
Children;
Children children;
};
