From d28774dc49e367dab02e7a61c89ce0de6f6f97d6 Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Wed, 25 Oct 2006 21:47:18 +0000 Subject: ChangeLogTag:Wed Oct 25 22:42:03 UTC 2006 Ossama Othman --- ACE/ChangeLog | 10 ++++++++++ ACE/tests/Integer_Truncate_Test.cpp | 32 ++++++++++++++++---------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/ACE/ChangeLog b/ACE/ChangeLog index fa1055269bf..493b4200c46 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Wed Oct 25 22:42:03 UTC 2006 Ossama Othman + + * tests/Integer_Truncate_Test.cpp: + + Remove "const" qualifiers from types used in + ACE_Utils::Truncate<>() function template parameters that are + deduced using argument dependent lookup. Borland appears to get + confused, and can't find the non-const template parameter + Truncate<>() specializations. + Wed Oct 25 20:17:13 UTC 2006 Ossama Othman * ace/Hash_Map_Manager_T.inl (ACE_Hash_Map_Iterator_Base_Ex): diff --git a/ACE/tests/Integer_Truncate_Test.cpp b/ACE/tests/Integer_Truncate_Test.cpp index 82ae387211f..f9c60764bca 100755 --- a/ACE/tests/Integer_Truncate_Test.cpp +++ b/ACE/tests/Integer_Truncate_Test.cpp @@ -37,7 +37,7 @@ sizeof_from_lt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) < sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f) != static_cast (f)) @@ -57,7 +57,7 @@ sizeof_from_lt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) < sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f) != static_cast (f)) @@ -77,8 +77,8 @@ sizeof_from_lt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) < sizeof (to_type)); - from_type const f1 = -1; // Should not be truncated. - from_type const f2 = + from_type f1 = -1; // Should not be truncated. + from_type f2 = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f1) != f1 @@ -99,7 +99,7 @@ sizeof_from_lt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) < sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f) != static_cast (f)) @@ -136,8 +136,8 @@ sizeof_from_eq_sizeof_to (void) ACE_ASSERT (sizeof (from_type) == sizeof (to_type)); - from_type const f1 = -1; // Should not be truncated. - from_type const f2 = + from_type f1 = -1; // Should not be truncated. + from_type f2 = ACE_Numeric_Limits::max (); // Should not be truncated. if (static_cast (Truncate (f1)) != f1 @@ -158,7 +158,7 @@ sizeof_from_eq_sizeof_to (void) ACE_ASSERT (sizeof (from_type) == sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should be truncated. if (Truncate (f) != ACE_Numeric_Limits::max ()) @@ -178,8 +178,8 @@ sizeof_from_eq_sizeof_to (void) ACE_ASSERT (sizeof (from_type) == sizeof (to_type)); - from_type const f1 = -1; // Should not be truncated. - from_type const f2 = + from_type f1 = -1; // Should not be truncated. + from_type f2 = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f1) != f1 @@ -200,7 +200,7 @@ sizeof_from_eq_sizeof_to (void) ACE_ASSERT (sizeof (from_type) == sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should not be truncated. if (Truncate (f) != f) @@ -237,7 +237,7 @@ sizeof_from_gt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) > sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should be truncated. if (Truncate (f) != ACE_Numeric_Limits::max ()) @@ -257,7 +257,7 @@ sizeof_from_gt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) > sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should be truncated. if (Truncate (f) != ACE_Numeric_Limits::max ()) @@ -277,8 +277,8 @@ sizeof_from_gt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) > sizeof (to_type)); - from_type const f1 = -1; // Should not be truncated. - from_type const f2 = + from_type f1 = -1; // Should not be truncated. + from_type f2 = ACE_Numeric_Limits::max (); // Should be truncated. if (Truncate (f1) != f1 @@ -299,7 +299,7 @@ sizeof_from_gt_sizeof_to (void) ACE_ASSERT (sizeof (from_type) > sizeof (to_type)); - from_type const f = + from_type f = ACE_Numeric_Limits::max (); // Should be truncated. if (Truncate (f) != ACE_Numeric_Limits::max ()) -- cgit v1.2.1