Mon Aug 13 14:52:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

2 files changed, 16 insertions, 7 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c1630363d83..08eeb632706 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,10 +1,16 @@
+Mon Aug 13 14:52:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Truncate.h:
+          Changed the new signed long/signed int specialization for BCB6
+          in such a way that it doesn't cause a compiler crash.
+
 Mon Aug 13 11:42:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/tao_other_tests.lst:
 
           Added the new notification service monitor functional test.
 
-Mon Aug 12 10:55;12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Aug 13 10:55:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/CDR_Stream.cpp:
           Const change
@@ -15,14 +21,14 @@ Mon Aug 12 10:55;12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
           not, use a special ACE value. This makes it easier to support QoS with
           MinGW.
 
-Mon Aug 12 07:03:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Aug 13 07:03:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Log_Msg_IPC.cpp:
           Fixed wrong calculation of payload size when unicode is enabled.
           Thanks to David Beck <davidbeck at acm dot org> for reporting this.
           This fixes bugzilla 3038
 
-Mon Aug 12 04:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Aug 13 04:40:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-linux-common.h:
           Always include config-posix.h, not only when ACE_HAS_LINUX_NPTL is
diff --git a/ACE/ace/Truncate.h b/ACE/ace/Truncate.h
index 9b5ab579da6..da171203126 100644
--- a/ACE/ace/Truncate.h
+++ b/ACE/ace/Truncate.h
@@ -766,10 +766,13 @@ namespace ACE_Utils
   {
     signed int operator() (signed long val)
     {
-      return
-        (val > static_cast<signed long> (ACE_Numeric_Limits<signed int>::max ())
-         ? ACE_Numeric_Limits<signed int>::max ()
-         : static_cast<signed int> (val));
+      return static_cast<signed int> (val);
+//      This code causes asserts and compiler crashes with BCB6 Static and
+//      BCB2007 Static
+//      return
+//        (val > static_cast<signed long> (ACE_Numeric_Limits<signed int>::max ())
+//         ? ACE_Numeric_Limits<signed int>::max ()
+//         : static_cast<signed int> (val));
     }
   };