ChangeLogTag:Wed Oct 25 20:17:13 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>

3 files changed, 46 insertions, 31 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 647792fc19c..fa1055269bf 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,18 @@
+Wed Oct 25 20:17:13 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
+
+        * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex):
+
+          Removed commented ACE_TRACE macro entirely.  Fuzz parses
+          commented out code, and still incorrectly reports an ACE_TRACE
+          mismatch.
+
+        * ace/Truncate.h:
+
+          Yet another attempt at placating Borland C++.  Removed the
+          partial specialization for truncating values of the same type.
+          Typedefed the underlying Truncator structure template to further
+          simplify the function call.
+
 Wed Oct 25 18:31:47 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
 
         * examples/C++NPv1/Reactive_Logging_Server.h:
diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl
index dbb68c7781a..bd14bd25c26 100644
--- a/ACE/ace/Hash_Map_Manager_T.inl
+++ b/ACE/ace/Hash_Map_Manager_T.inl
@@ -498,8 +498,6 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID,
     index_ (head ? -1 : (ssize_t) mm.total_size_),
     next_ (0)
 {
-//   ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_Hash_Map_Iterator_Base_Ex");
-
   if (mm.table_ != 0)
     this->next_ = &mm.table_[head ? 0 : mm.total_size_ - 1];
 }
diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index 64483e866be..d434811f426 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -493,14 +493,14 @@ namespace ACE_Utils
 
   // Partial specialization for the case where the types are the same.
   // No truncation is necessary.
-  template<typename T>
-  struct Truncator<T, T>
-  {
-    static T trunc (T val)
-    {
-      return val;
-    }
-  };
+//   template<typename T>
+//   struct Truncator<T, T>
+//   {
+//     T operator() (T val)
+//     {
+//       return val;
+//     }
+//   };
 
   //----------------------------------------------------------
   // sizeof(FROM) >  sizeof(TO)
@@ -509,7 +509,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT32, ACE_INT8>
   {
-    static ACE_INT8 trunc (ACE_INT32 val)
+    ACE_INT8 operator() (ACE_INT32 val)
     {
       return 
         (val > ACE_Numeric_Limits<ACE_INT8>::max ()
@@ -521,7 +521,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT32, ACE_UINT8>
   {
-    static ACE_UINT8 trunc (ACE_UINT32 val)
+    ACE_UINT8 operator() (ACE_UINT32 val)
     {
       return 
         (val > static_cast<ACE_UINT32> (ACE_Numeric_Limits<ACE_UINT8>::max ())
@@ -533,7 +533,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT32, ACE_UINT8>
   {
-    static ACE_UINT8 trunc (ACE_INT32 val)
+    ACE_UINT8 operator() (ACE_INT32 val)
     {
       return 
         (val > static_cast<ACE_INT32> (ACE_Numeric_Limits<ACE_UINT8>::max ())
@@ -545,7 +545,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT32, ACE_INT8>
   {
-    static ACE_INT8 trunc (ACE_UINT32 val)
+    ACE_INT8 operator() (ACE_UINT32 val)
     {
       return 
         (val > static_cast<ACE_UINT32> (ACE_Numeric_Limits<ACE_INT8>::max ())
@@ -557,7 +557,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT64, ACE_INT32>
   {
-    static ACE_INT32 trunc (ACE_INT64 val)
+    ACE_INT32 operator() (ACE_INT64 val)
     {
       return 
         (val > ACE_Numeric_Limits<ACE_INT32>::max ()
@@ -569,7 +569,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT64, ACE_UINT32>
   {
-    static ACE_UINT32 trunc (ACE_INT64 val)
+    ACE_UINT32 operator() (ACE_INT64 val)
     {
       return 
         (val > static_cast<ACE_INT64> (ACE_Numeric_Limits<ACE_UINT32>::max ())
@@ -581,7 +581,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT64, ACE_UINT32>
   {
-    static ACE_UINT32 trunc (ACE_UINT64 val)
+    ACE_UINT32 operator() (ACE_UINT64 val)
     {
       return 
         (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<ACE_UINT32>::max ())
@@ -593,7 +593,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT64, ACE_INT32>
   {
-    static ACE_INT32 trunc (ACE_UINT64 val)
+    ACE_INT32 operator() (ACE_UINT64 val)
     {
       return 
         (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<ACE_INT32>::max ())
@@ -609,7 +609,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT32, ACE_UINT32>
   {
-    static ACE_UINT32 trunc (ACE_INT32 val)
+    ACE_UINT32 operator() (ACE_INT32 val)
     {
       return static_cast<ACE_UINT32> (val);
     }
@@ -618,7 +618,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT32, ACE_INT32>
   {
-    static ACE_INT32 trunc (ACE_UINT32 val)
+    ACE_INT32 operator() (ACE_UINT32 val)
     {
       return 
         (val > static_cast<ACE_UINT32> (ACE_Numeric_Limits<ACE_INT32>::max ())
@@ -630,7 +630,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT64, ACE_UINT64>
   {
-    static ACE_UINT64 trunc (ACE_INT64 val)
+    ACE_UINT64 operator() (ACE_INT64 val)
     {
       return static_cast<ACE_UINT64> (val);
     }
@@ -639,7 +639,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT64, ACE_INT64>
   {
-    static ACE_INT64 trunc (ACE_UINT64 val)
+    ACE_INT64 operator() (ACE_UINT64 val)
     {
       return 
         (val > static_cast<ACE_UINT64> (ACE_Numeric_Limits<ACE_INT64>::max ())
@@ -655,7 +655,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT8, ACE_INT32>
   {
-    static ACE_INT32 trunc (ACE_INT8 val)
+    ACE_INT32 operator() (ACE_INT8 val)
     {
       return static_cast<ACE_INT32> (val);
     }
@@ -664,7 +664,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT8, ACE_UINT32>
   {
-    static ACE_UINT32 trunc (ACE_UINT8 val)
+    ACE_UINT32 operator() (ACE_UINT8 val)
     {
       return static_cast<ACE_UINT32> (val);
     }
@@ -673,7 +673,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT8, ACE_INT32>
   {
-    static ACE_INT32 trunc (ACE_UINT8 val)
+    ACE_INT32 operator() (ACE_UINT8 val)
     {
       return static_cast<ACE_INT32> (val);
     }
@@ -682,7 +682,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT8, ACE_UINT32>
   {
-    static ACE_UINT32 trunc (ACE_INT8 val)
+    ACE_UINT32 operator() (ACE_INT8 val)
     {
       return static_cast<ACE_UINT32> (val);
     }
@@ -691,7 +691,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT32, ACE_INT64>
   {
-    static ACE_INT64 trunc (ACE_INT32 val)
+    ACE_INT64 operator() (ACE_INT32 val)
     {
       return static_cast<ACE_INT64> (val);
     }
@@ -700,7 +700,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_INT32, ACE_UINT64>
   {
-    static ACE_UINT64 trunc (ACE_INT32 val)
+    ACE_UINT64 operator() (ACE_INT32 val)
     {
       return static_cast<ACE_UINT64> (val);
     }
@@ -709,7 +709,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT32, ACE_UINT64>
   {
-    static ACE_UINT64 trunc (ACE_UINT32 val)
+    ACE_UINT64 operator() (ACE_UINT32 val)
     {
       return static_cast<ACE_UINT64> (val);
     }
@@ -718,7 +718,7 @@ namespace ACE_Utils
   template<>
   struct ACE_Export Truncator<ACE_UINT32, ACE_INT64>
   {
-    static ACE_INT64 trunc (ACE_UINT32 val)
+    ACE_INT64 operator() (ACE_UINT32 val)
     {
       return static_cast<ACE_INT64> (val);
     }
@@ -728,7 +728,9 @@ namespace ACE_Utils
   template<typename TO, typename FROM>
   inline TO Truncate (FROM val)
   {
-    return Truncator<FROM, TO>::trunc (val);
+    typedef Truncator<FROM, TO> truncator;
+
+    return truncator() (val);
   }
 
 #endif  /* !__BORLANDC__ || __BORLANDC__ > 0x582 */