File gcc4.patch of Package openwbem
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_Array.hpp ./src/common/OW_Array.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_Array.hpp 2005-02-03 01:52:44.000000000 +0100
+++ ./src/common/OW_Array.hpp 2012-09-26 10:34:18.811492171 +0200
@@ -37,10 +37,10 @@
#define OW_ARRAY_HPP_INCLUDE_GUARD_
#include "OW_config.h"
#include "OW_ArrayFwd.hpp"
-#include "OW_COWReference.hpp"
#include "OW_Types.hpp"
#include "OW_Exception.hpp"
#include "OW_vector.hpp"
+#include "OW_COWReference.hpp"
namespace OW_NAMESPACE
{
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_COWReference.hpp ./src/common/OW_COWReference.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_COWReference.hpp 2006-02-02 19:44:18.000000000 +0100
+++ ./src/common/OW_COWReference.hpp 2012-09-26 12:15:29.469360649 +0200
@@ -139,6 +139,14 @@
//////////////////////////////////////////////////////////////////////////////
template<class T>
+inline T* COWReferenceClone(T* obj)
+{
+ // default implementation. If a certain class doesn't have clone()
+ // (like std::vector), then they can overload this function
+ return obj->clone();
+}
+//////////////////////////////////////////////////////////////////////////////
+template<class T>
inline void COWReference<T>::getWriteLock()
{
if (COWReferenceBase::refCountGreaterThanOne())
@@ -278,15 +286,6 @@
return a.getPtr() < b.getPtr();
}
-//////////////////////////////////////////////////////////////////////////////
-template <class T>
-inline T* COWReferenceClone(T* obj)
-{
- // default implementation. If a certain class doesn't have clone()
- // (like std::vector), then they can overload this function
- return obj->clone();
-}
-
} // end namespace OW_NAMESPACE
#endif // OW_COWREFERENCE_HPP_
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_Exec.cpp ./src/common/OW_Exec.cpp
--- ../orig-openwbem-3.2.3/src/common/OW_Exec.cpp 2005-05-23 21:58:09.000000000 +0200
+++ ./src/common/OW_Exec.cpp 2012-09-26 10:52:51.258264700 +0200
@@ -34,11 +34,11 @@
*/
#include "OW_config.h"
+#include "OW_Array.hpp"
#include "OW_Exec.hpp"
#include "OW_Format.hpp"
#include "OW_Assertion.hpp"
#include "OW_PosixUnnamedPipe.hpp"
-#include "OW_Array.hpp"
#include "OW_IOException.hpp"
#include "OW_Thread.hpp"
#include "OW_Select.hpp"
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_HashMap.hpp ./src/common/OW_HashMap.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_HashMap.hpp 2005-02-12 00:00:40.000000000 +0100
+++ ./src/common/OW_HashMap.hpp 2012-09-26 11:10:46.439707517 +0200
@@ -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
+#ifdef 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 -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_HashMultiMap.hpp ./src/common/OW_HashMultiMap.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_HashMultiMap.hpp 2005-02-03 05:34:18.000000000 +0100
+++ ./src/common/OW_HashMultiMap.hpp 2012-09-26 11:23:48.672977993 +0200
@@ -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
+#ifdef 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 -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_List.hpp ./src/common/OW_List.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_List.hpp 2005-02-03 01:52:44.000000000 +0100
+++ ./src/common/OW_List.hpp 2012-09-26 13:31:34.501007219 +0200
@@ -290,7 +290,7 @@
x.swap(y);
}
template <class T>
-std::list<T>* COWReferenceClone(std::list<T>* obj)
+inline std::list<T>* COWReferenceClone(std::list<T>* obj)
{
return new std::list<T>(*obj);
}
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_SortedVectorMap.hpp ./src/common/OW_SortedVectorMap.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_SortedVectorMap.hpp 2005-02-03 01:52:45.000000000 +0100
+++ ./src/common/OW_SortedVectorMap.hpp 2012-09-26 11:25:49.134105206 +0200
@@ -35,8 +35,8 @@
#ifndef OW_SORTED_VECTOR_MAP_HPP_
#define OW_SORTED_VECTOR_MAP_HPP_
#include "OW_config.h"
-#include "OW_COWReference.hpp"
#include "OW_vector.hpp"
+#include "OW_COWReference.hpp"
#include "OW_CommonFwd.hpp"
#include <utility> // for std::pair
#include <functional> // for std::less
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_Stack.hpp ./src/common/OW_Stack.hpp
--- ../orig-openwbem-3.2.3/src/common/OW_Stack.hpp 2005-02-03 01:52:45.000000000 +0100
+++ ./src/common/OW_Stack.hpp 2012-09-26 11:11:28.313478924 +0200
@@ -54,7 +54,7 @@
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 -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-openwbem-3.2.3/src/common/OW_String.cpp ./src/common/OW_String.cpp
--- ../orig-openwbem-3.2.3/src/common/OW_String.cpp 2005-03-17 20:23:23.000000000 +0100
+++ ./src/common/OW_String.cpp 2012-09-26 10:56:41.727945041 +0200
@@ -581,7 +581,7 @@
size_t
String::indexOf(const char* arg, size_t fromIndex) const
{
- int cc = npos;
+ size_t cc = npos;
if (fromIndex < length())
{
// Don't need to check m_buf for NULL, because if length() == 0,
@@ -598,7 +598,7 @@
if (p != NULL)
{
- cc = static_cast<int>(p - m_buf->data());
+ cc = static_cast<size_t>(p - m_buf->data());
}
}
return cc;
