Define functions used by templates before this use.

Add some missing includes. Prefer ext/hash_map over hash_map.

17 files changed, 273 insertions, 1 deletions

diff --git a/net/openwbem/distinfo b/net/openwbem/distinfo
index 7506aed2eb0..dee861959c7 100644
--- a/net/openwbem/distinfo
+++ b/net/openwbem/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/11/24 13:40:05 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/03/26 23:34:34 joerg Exp $
 
 SHA1 (openwbem-3.2.2.tar.gz) = 3272e5cbcfb2a864cccf71e15e0da0f6623420bb
 RMD160 (openwbem-3.2.2.tar.gz) = 31ce8c80d47ff7539315e3978b8c1c493bd17f35
@@ -9,7 +9,23 @@ SHA1 (patch-ac) = ea2f928b13eaef464e133b0e510fa4b8cfee95b9
 SHA1 (patch-ad) = e8b7c3a3b7fbab6052a9e866c8a1c9f1653db590
 SHA1 (patch-ae) = a9d923bdf6e52acff83588605f2913b196c92038
 SHA1 (patch-src_cim_OW__CIMDateTime.cpp) = 186db29470cbe526c4e18aca13604ab578b3bad3
+SHA1 (patch-src_cimom_server_OW__Platform.cpp) = f7a2f848f565c0c33810bc90ff1455598c024769
+SHA1 (patch-src_cimom_server_OW__PlatformSignal.cpp) = f6d2427d1a2f0bce8cbbc558583bd7d429cfc515
+SHA1 (patch-src_common_OW__COWReference.hpp) = f67f64de56a8745d24a0d738b9c546f5edf249d8
+SHA1 (patch-src_common_OW__HashMap.hpp) = 37475181bf6e979bde55ef717f14ce62ab730aed
+SHA1 (patch-src_common_OW__HashMultiMap.hpp) = 3d94543356bf0837996a9faf4075ccc6965bd462
+SHA1 (patch-src_common_OW__List.hpp) = e106aca83db05b484ad573cb8da889453321836f
 SHA1 (patch-src_common_OW__LogMessagePatternFormatter.cpp) = 8566874493e1c5def31dd0e27d42b65c6f3f3ff8
 SHA1 (patch-src_common_OW__PosixFile.cpp) = 865435218984a3106229cb74e72af1d6b29625db
+SHA1 (patch-src_common_OW__SharedLibraryReference.hpp) = 3b3ebb250fe602a93ef53915a232fa9919bec7b2
+SHA1 (patch-src_common_OW__Stack.hpp) = d63effa7cd81e6671611929edf46f8ba206d9588
 SHA1 (patch-src_common_OW__StackTrace.cpp) = 14e3dbdaea069c5ae47d9e06f7e337dd74110b88
 SHA1 (patch-src_common_socket_OW__SocketAddress.cpp) = 64af2ecb1f5164bacef823d5769a52c513470db1
+SHA1 (patch-src_mof_OW__MOFCompiler.cpp) = bc90a3864f40c535785100e911204221da51403b
+SHA1 (patch-src_mof_OW__MOFCompiler.hpp) = 520e8cadaa586a4c4ab17b10d099b33fb539f893
+SHA1 (patch-src_providerifcs_cmpi_common_cmpiBrokerEnc.cpp) = c5cf33a0c9be47f064d3300e067fc1aa08609145
+SHA1 (patch-src_providerifcs_cmpi_common_cmpiInstance.cpp) = 98d65bcc930c10125d709077f5cb5156f22653fb
+SHA1 (patch-src_providerifcs_npi_OW__FTABLERef.hpp) = b05ffdf130bfd4fe94e818ad4a66bb763afea1e7
+SHA1 (patch-src_providerifcs_npi_common_NPIExternal.hpp) = 7b719d1111b2a2f8da8a12fc1da169645ffcf45a
+SHA1 (patch-src_providerifcs_remote_OW__RemoteProviderInterface.cpp) = c786b848ca905cd5a7cc664597b9836ac3e09cda
+SHA1 (patch-src_repositories_hdb_OW__AssocDb.hpp) = a25f7372b2fc0f28f5eb994a705de5c61b519627
diff --git a/net/openwbem/patches/patch-src_cimom_server_OW__Platform.cpp b/net/openwbem/patches/patch-src_cimom_server_OW__Platform.cpp
new file mode 100644
index 00000000000..260205367cb
--- /dev/null
+++ b/net/openwbem/patches/patch-src_cimom_server_OW__Platform.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cimom_server_OW__Platform.cpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/cimom/server/OW_Platform.cpp.orig	2013-03-25 15:28:45.000000000 +0000
++++ src/cimom/server/OW_Platform.cpp
+@@ -34,6 +34,7 @@
+  * @author Bart Whiteley
+  */
+ 
++#include <cstdlib>
+ #include "OW_config.h"
+ #include "OW_Platform.hpp"
+ #include "OW_ConfigOpts.hpp"
diff --git a/net/openwbem/patches/patch-src_cimom_server_OW__PlatformSignal.cpp b/net/openwbem/patches/patch-src_cimom_server_OW__PlatformSignal.cpp
new file mode 100644
index 00000000000..c2be976751c
--- /dev/null
+++ b/net/openwbem/patches/patch-src_cimom_server_OW__PlatformSignal.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_cimom_server_OW__PlatformSignal.cpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/cimom/server/OW_PlatformSignal.cpp.orig	2013-03-25 15:29:11.000000000 +0000
++++ src/cimom/server/OW_PlatformSignal.cpp
+@@ -36,6 +36,7 @@
+ #include "OW_PlatformSignal.hpp"
+ #include "OW_UserUtils.hpp"
+ #include <ostream>
++#include <cstring>
+ 
+ namespace OW_NAMESPACE
+ {
diff --git a/net/openwbem/patches/patch-src_common_OW__COWReference.hpp b/net/openwbem/patches/patch-src_common_OW__COWReference.hpp
new file mode 100644
index 00000000000..c09fff31f22
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__COWReference.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_common_OW__COWReference.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_COWReference.hpp.orig	2013-03-25 15:04:13.000000000 +0000
++++ src/common/OW_COWReference.hpp
+@@ -35,6 +35,7 @@
+ #ifndef OW_COWREFERENCE_HPP_INCLUDE_GUARD_
+ #define OW_COWREFERENCE_HPP_INCLUDE_GUARD_
+ #include "OW_config.h"
++#include "OW_vector.hpp"
+ #include "OW_COWReferenceBase.hpp"
+ 
+ namespace OW_NAMESPACE
diff --git a/net/openwbem/patches/patch-src_common_OW__HashMap.hpp b/net/openwbem/patches/patch-src_common_OW__HashMap.hpp
new file mode 100644
index 00000000000..67a654cc7f5
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__HashMap.hpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_common_OW__HashMap.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_HashMap.hpp.orig	2013-03-25 15:16:33.000000000 +0000
++++ src/common/OW_HashMap.hpp
+@@ -35,14 +35,14 @@
+ #ifndef OW_HASH_MAP_HPP_INCLUDE_GUARD_
+ #define OW_HASH_MAP_HPP_INCLUDE_GUARD_
+ #include "OW_config.h"
+-#ifdef OW_HAVE_HASH_MAP
+-	#include <hash_map> // hash_map is better for the cache than OW_SortedVectorMap
+-	#define OW_HASH_MAP_NS std
+-	#define HashMap std::hash_map
+-#elif OW_HAVE_EXT_HASH_MAP
++#if OW_HAVE_EXT_HASH_MAP
+ 	#include <ext/hash_map> // hash_map is better for the cache than OW_SortedVectorMap
+ 	#define OW_HASH_MAP_NS __gnu_cxx
+ 	#define HashMap __gnu_cxx::hash_map
++#elif OW_HAVE_HASH_MAP
++	#include <hash_map> // hash_map is better for the cache than OW_SortedVectorMap
++	#define OW_HASH_MAP_NS std
++	#define HashMap std::hash_map
+ #else
+ 	#include "OW_SortedVectorMap.hpp"
+ 	#define OW_HASH_MAP_NS OW_NAMESPACE
diff --git a/net/openwbem/patches/patch-src_common_OW__HashMultiMap.hpp b/net/openwbem/patches/patch-src_common_OW__HashMultiMap.hpp
new file mode 100644
index 00000000000..7bada9f2ec8
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__HashMultiMap.hpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_common_OW__HashMultiMap.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_HashMultiMap.hpp.orig	2013-03-25 15:16:16.000000000 +0000
++++ src/common/OW_HashMultiMap.hpp
+@@ -35,14 +35,14 @@
+ #ifndef OW_HASH_MULTI_MAP_HPP_INCLUDE_GUARD_
+ #define OW_HASH_MULTI_MAP_HPP_INCLUDE_GUARD_
+ #include "OW_config.h"
+-#ifdef OW_HAVE_HASH_MAP
+-	#include <hash_map>
+-	#define OW_HASH_MAP_NS std
+-	#define HashMultiMap std::hash_multimap
+-#elif OW_HAVE_EXT_HASH_MAP
++#if OW_HAVE_EXT_HASH_MAP
+ 	#include <ext/hash_map>
+ 	#define OW_HASH_MAP_NS __gnu_cxx
+ 	#define HashMultiMap __gnu_cxx::hash_multimap
++#elif OW_HAVE_HASH_MAP
++	#include <hash_map>
++	#define OW_HASH_MAP_NS std
++	#define HashMultiMap std::hash_multimap
+ #else
+ 	// TODO: Write a real hash multi map
+ 	#include <map>
diff --git a/net/openwbem/patches/patch-src_common_OW__List.hpp b/net/openwbem/patches/patch-src_common_OW__List.hpp
new file mode 100644
index 00000000000..a2d755c2b85
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__List.hpp
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_common_OW__List.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_List.hpp.orig	2013-03-25 15:33:34.000000000 +0000
++++ src/common/OW_List.hpp
+@@ -36,12 +36,10 @@
+ #ifndef OW_LIST_HPP_INCLUDE_GUARD_
+ #define OW_LIST_HPP_INCLUDE_GUARD_
+ #include "OW_config.h"
+-#include "OW_COWReference.hpp"
+ #include <list>
+ 
+ namespace OW_NAMESPACE
+ {
+-
+ // forward declarations are necessary for template friends.
+ template<class T> class List;
+ 
+@@ -51,7 +49,17 @@ inline bool operator==(const List<T>& x,
+ template <class T>
+ inline bool operator<(const List<T>& x, const List<T>& y);
+ 
+-	
++template <class T>
++std::list<T>* COWReferenceClone(std::list<T>* obj)
++{
++	return new std::list<T>(*obj);
++}
++}
++
++#include "OW_COWReference.hpp"
++
++namespace OW_NAMESPACE
++{
+ /**
+  * This class is a wrapper around std::list<> and adds COW capabilities.
+  */
+@@ -289,11 +297,6 @@ inline void swap(List<T>& x, List<T>& y)
+ {
+ 	x.swap(y);
+ }
+-template <class T>
+-std::list<T>* COWReferenceClone(std::list<T>* obj)
+-{
+-	return new std::list<T>(*obj);
+-}
+ 
+ } // end namespace OW_NAMESPACE
+ 
diff --git a/net/openwbem/patches/patch-src_common_OW__SharedLibraryReference.hpp b/net/openwbem/patches/patch-src_common_OW__SharedLibraryReference.hpp
new file mode 100644
index 00000000000..ee6ee9f9c1a
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__SharedLibraryReference.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_OW__SharedLibraryReference.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_SharedLibraryReference.hpp.orig	2013-03-25 15:05:11.000000000 +0000
++++ src/common/OW_SharedLibraryReference.hpp
+@@ -113,7 +113,7 @@ public:
+ 	{
+ 		SharedLibraryReference<U> rval;
+ 		rval.m_sharedLib = m_sharedLib;
+-		rval.m_obj = m_obj.cast_to<U>();
++		rval.m_obj = m_obj.template cast_to<U>();
+ 		return rval;
+ 	}
+ 
diff --git a/net/openwbem/patches/patch-src_common_OW__Stack.hpp b/net/openwbem/patches/patch-src_common_OW__Stack.hpp
new file mode 100644
index 00000000000..1fef8dbd0e2
--- /dev/null
+++ b/net/openwbem/patches/patch-src_common_OW__Stack.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_common_OW__Stack.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/common/OW_Stack.hpp.orig	2013-03-25 15:18:00.000000000 +0000
++++ src/common/OW_Stack.hpp
+@@ -54,7 +54,7 @@ public:
+ 	reference top() {   return this->back(); }
+ 	const_reference top() const {   return this->back(); }
+ 	void pop() { this->pop_back(); }
+-	void push(const T& x) {   push_back(x); }
++	void push(const T& x) { this->push_back(x); }
+ 	int search(const T& x) const
+ 	{
+ 		int i = find(x);
diff --git a/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.cpp b/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.cpp
new file mode 100644
index 00000000000..5fb9feb1edc
--- /dev/null
+++ b/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_mof_OW__MOFCompiler.cpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/mof/OW_MOFCompiler.cpp.orig	2013-03-25 15:38:25.000000000 +0000
++++ src/mof/OW_MOFCompiler.cpp
+@@ -51,6 +51,7 @@
+ 
+ #include <assert.h>
+ #include <cctype>
++#include <climits>
+ 
+ // forward declarations of some lex/yacc functions we need to call.
+ void owmof_delete_buffer(YY_BUFFER_STATE b);
diff --git a/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.hpp b/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.hpp
new file mode 100644
index 00000000000..aeb5a64d3a4
--- /dev/null
+++ b/net/openwbem/patches/patch-src_mof_OW__MOFCompiler.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_mof_OW__MOFCompiler.hpp,v 1.1 2013/03/26 23:34:34 joerg Exp $
+
+--- src/mof/OW_MOFCompiler.hpp.orig	2013-03-25 15:37:55.000000000 +0000
++++ src/mof/OW_MOFCompiler.hpp
+@@ -35,6 +35,7 @@
+ #ifndef OW_MOF_COMPILER_HPP_INCLUDE_GUARD_
+ #define OW_MOF_COMPILER_HPP_INCLUDE_GUARD_
+ #include "OW_config.h"
++#include "OW_List.hpp"
+ #include "OW_CIMOMHandleIFC.hpp"
+ #include "OW_String.hpp"
+ #include "OW_MOFParserErrorHandlerIFC.hpp"
diff --git a/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiBrokerEnc.cpp b/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiBrokerEnc.cpp
new file mode 100644
index 00000000000..dcd164ef4cb
--- /dev/null
+++ b/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiBrokerEnc.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_providerifcs_cmpi_common_cmpiBrokerEnc.cpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp.orig	2013-03-25 15:27:10.000000000 +0000
++++ src/providerifcs/cmpi/common/cmpiBrokerEnc.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include "cmpisrv.h"
+ #include "OW_CIMException.hpp"
+ #include "OW_CIMProperty.hpp"
diff --git a/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiInstance.cpp b/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiInstance.cpp
new file mode 100644
index 00000000000..012018bf30b
--- /dev/null
+++ b/net/openwbem/patches/patch-src_providerifcs_cmpi_common_cmpiInstance.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_providerifcs_cmpi_common_cmpiInstance.cpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/providerifcs/cmpi/common/cmpiInstance.cpp.orig	2013-03-25 15:27:54.000000000 +0000
++++ src/providerifcs/cmpi/common/cmpiInstance.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <cstring>
+ #include "cmpisrv.h"
+ #include "OW_CIMInstance.hpp"
+ 
diff --git a/net/openwbem/patches/patch-src_providerifcs_npi_OW__FTABLERef.hpp b/net/openwbem/patches/patch-src_providerifcs_npi_OW__FTABLERef.hpp
new file mode 100644
index 00000000000..059240fdd58
--- /dev/null
+++ b/net/openwbem/patches/patch-src_providerifcs_npi_OW__FTABLERef.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_providerifcs_npi_OW__FTABLERef.hpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/providerifcs/npi/OW_FTABLERef.hpp.orig	2013-03-25 15:26:20.000000000 +0000
++++ src/providerifcs/npi/OW_FTABLERef.hpp
+@@ -29,7 +29,7 @@
+ *******************************************************************************/
+ #ifndef OW_FTABLE_REF_HPP_
+ #define OW_FTABLE_REF_HPP_
+-//#include <string.h>
++#include <cstring>
+ #include "OW_config.h"
+ #include "OW_CIMOMHandleIFC.hpp"
+ #include "OW_CIMDataType.hpp"
diff --git a/net/openwbem/patches/patch-src_providerifcs_npi_common_NPIExternal.hpp b/net/openwbem/patches/patch-src_providerifcs_npi_common_NPIExternal.hpp
new file mode 100644
index 00000000000..27e6f900c88
--- /dev/null
+++ b/net/openwbem/patches/patch-src_providerifcs_npi_common_NPIExternal.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_providerifcs_npi_common_NPIExternal.hpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/providerifcs/npi/common/NPIExternal.hpp.orig	2013-03-25 15:25:53.000000000 +0000
++++ src/providerifcs/npi/common/NPIExternal.hpp
+@@ -17,6 +17,7 @@
+ #ifndef NPIExternal_h
+ #define NPIExternal_h
+ #include "OW_FTABLERef.hpp"
++#include <cstdlib>
+ 
+ namespace OW_NAMESPACE
+ {
diff --git a/net/openwbem/patches/patch-src_providerifcs_remote_OW__RemoteProviderInterface.cpp b/net/openwbem/patches/patch-src_providerifcs_remote_OW__RemoteProviderInterface.cpp
new file mode 100644
index 00000000000..1c777b85f70
--- /dev/null
+++ b/net/openwbem/patches/patch-src_providerifcs_remote_OW__RemoteProviderInterface.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_providerifcs_remote_OW__RemoteProviderInterface.cpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/providerifcs/remote/OW_RemoteProviderInterface.cpp.orig	2013-03-25 15:24:54.000000000 +0000
++++ src/providerifcs/remote/OW_RemoteProviderInterface.cpp
+@@ -33,6 +33,7 @@
+  */
+ 
+ #include "OW_config.h"
++#include "OW_ClientCIMOMHandle.hpp"
+ #include "OW_RemoteProviderInterface.hpp"
+ #include "OW_RemoteInstanceProvider.hpp"
+ #include "OW_RemoteSecondaryInstanceProvider.hpp"
diff --git a/net/openwbem/patches/patch-src_repositories_hdb_OW__AssocDb.hpp b/net/openwbem/patches/patch-src_repositories_hdb_OW__AssocDb.hpp
new file mode 100644
index 00000000000..19c6572b7bb
--- /dev/null
+++ b/net/openwbem/patches/patch-src_repositories_hdb_OW__AssocDb.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_repositories_hdb_OW__AssocDb.hpp,v 1.1 2013/03/26 23:34:35 joerg Exp $
+
+--- src/repositories/hdb/OW_AssocDb.hpp.orig	2013-03-25 15:20:50.000000000 +0000
++++ src/repositories/hdb/OW_AssocDb.hpp
+@@ -50,6 +50,8 @@
+ #include "OW_IntrusiveReference.hpp"
+ #include "OW_IntrusiveCountableBase.hpp"
+ 
++#include <cstring>
++
+ namespace OW_NAMESPACE
+ {
+