< Previous by Date Date Index Next by Date >
< Previous in Thread Thread Index  

RE: [reSIProcate] gcc-3.4 support


Jason,

On Wed, 21 Jul 2004, Jason Fischl wrote:

> Thanks. I applied both of your patches and checked them in.

The following part of one of the patches was not applied / checked in:

Index: resiprocate/sip/resiprocate/dum/DialogId.hxx
===================================================================
--- resiprocate/sip/resiprocate/dum/DialogId.hxx        (revision 3135)
+++ resiprocate/sip/resiprocate/dum/DialogId.hxx        (working copy)
@@ -41,10 +41,13 @@
 #if defined(HASH_MAP_NAMESPACE)
 namespace HASH_MAP_NAMESPACE
 {
+
+template <>
 struct hash<resip::DialogId>
 {
       size_t operator()(const resip::DialogId& id) const;
 };
+
 }
 #elif defined(__INTEL_COMPILER)
 namespace std { size_t hash_value(const resip::DialogId& id); }
Index: resiprocate/sip/resiprocate/dum/DialogSetId.hxx
===================================================================
--- resiprocate/sip/resiprocate/dum/DialogSetId.hxx     (revision 3135)
+++ resiprocate/sip/resiprocate/dum/DialogSetId.hxx     (working copy)
@@ -49,10 +49,13 @@
 #elif defined(HASH_MAP_NAMESPACE)  //#elif ( (__GNUC__ == 3) && 
(__GNUC_MINOR__ >= 1) )
 namespace HASH_MAP_NAMESPACE
 {
+
+template <>
 struct hash<resip::DialogSetId>
 {
       size_t operator()(const resip::DialogSetId& id) const;
 };
+
 }
 #endif
 
Index: resiprocate/sip/resiprocate/dum/UInt64Hash.hxx
===================================================================
--- resiprocate/sip/resiprocate/dum/UInt64Hash.hxx      (revision 3135)
+++ resiprocate/sip/resiprocate/dum/UInt64Hash.hxx      (working copy)
@@ -13,10 +13,13 @@
 #elif defined(HASH_MAP_NAMESPACE)  //#elif ( (__GNUC__ == 3) && 
(__GNUC_MINOR__ >= 1) )
 namespace HASH_MAP_NAMESPACE
 {
+
+template<>
 struct hash<UInt64>
 {
       size_t operator()(const UInt64& v) const;
 };
+
 }
 #endif
 
Index: resiprocate/sip/resiprocate/os/Data.hxx
===================================================================
--- resiprocate/sip/resiprocate/os/Data.hxx     (revision 3135)
+++ resiprocate/sip/resiprocate/os/Data.hxx     (working copy)
@@ -230,6 +230,8 @@
 #elif defined(HASH_MAP_NAMESPACE)  //#elif ( (__GNUC__ == 3) && 
(__GNUC_MINOR__ >= 1) )
 namespace HASH_MAP_NAMESPACE
 {
+
+template <>
 struct hash<resip::Data>
 {
       size_t operator()(const resip::Data& data) const;
Index: resiprocate/sip/resiprocate/os/HashMap.hxx
===================================================================
--- resiprocate/sip/resiprocate/os/HashMap.hxx  (revision 3135)
+++ resiprocate/sip/resiprocate/os/HashMap.hxx  (working copy)
@@ -21,7 +21,7 @@
          return size_t(t);
       }
 };
- 
+
 }
 
 #  elif  defined(__INTEL_COMPILER )
Index: resiprocate/sip/resiprocate/os/Tuple.hxx
===================================================================
--- resiprocate/sip/resiprocate/os/Tuple.hxx    (revision 3135)
+++ resiprocate/sip/resiprocate/os/Tuple.hxx    (working copy)
@@ -111,11 +111,12 @@
 namespace __gnu_cxx
 {
 
+template <>
 struct hash<resip::Tuple>
 {
       size_t operator()(const resip::Tuple& addrPort) const;
 };
- 
+
 }
 
 #endif // hash stuff


...Bye..Dmitry.