Fri Aug 8 08:36:11 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 21 insertions, 0 deletions

diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index d0ec7aa7b7f..ce32336280b 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -717,6 +717,18 @@ namespace ACE_Utils
   };
 
   template<>
+  struct Truncator<const unsigned int, signed int>
+  {
+    signed int operator() (const unsigned int val)
+    {
+      return
+        (val > static_cast<unsigned int> (ACE_Numeric_Limits<signed int>::max ())
+         ? ACE_Numeric_Limits<signed int>::max ()
+         : static_cast<signed int> (val));
+    }
+  };
+
+  template<>
   struct Truncator<signed long, unsigned long>
   {
     unsigned long operator() (signed long val)
@@ -750,6 +762,15 @@ namespace ACE_Utils
   };
 
   template<>
+  struct Truncator<signed int, signed long>
+  {
+    signed long operator() (signed int val)
+    {
+      return static_cast<signed long> (val);
+    }
+  };
+
+  template<>
   struct Truncator<unsigned long, signed int>
   {
     signed int operator() (unsigned long val)