Wed Jul 25 08:24:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 50 insertions, 64 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5a5008c2e41..da11a024120 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Wed Jul 25 08:24:23 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Size.cpp:
+          If an argument isn't used, just not give it a name and
+          then remove ACE_UNUSED_ARG
+
+        * ace/CDR_Stream.h:
+        * ace/CDR_Size.inl:
+          Layout change
+
+        * ace/OS_NS_time.inl:
+          Const change
+
+        * bin/tao_other_tests.lst:
+          Don't run 2709 when ST is defined
+
 Tue Jul 24 22:45:37 UTC 2007  Steve Huston  <shuston@riverace.com>
 
         * ace/Bound_Ptr.inl (operator=): Check for assign-to-self first;
diff --git a/ACE/ace/CDR_Size.cpp b/ACE/ace/CDR_Size.cpp
index a6961804384..c737db786d9 100644
--- a/ACE/ace/CDR_Size.cpp
+++ b/ACE/ace/CDR_Size.cpp
@@ -145,56 +145,49 @@ ACE_SizeCDR::write_wstring (ACE_CDR::ULong len,
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_1 (const ACE_CDR::Octet *x)
+ACE_SizeCDR::write_1 (const ACE_CDR::Octet *)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (1);
   return true;
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_2 (const ACE_CDR::UShort *x)
+ACE_SizeCDR::write_2 (const ACE_CDR::UShort *)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (ACE_CDR::SHORT_SIZE);
   return true;
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_4 (const ACE_CDR::ULong *x)
+ACE_SizeCDR::write_4 (const ACE_CDR::ULong *)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (ACE_CDR::LONG_SIZE);
   return true;
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_8 (const ACE_CDR::ULongLong *x)
+ACE_SizeCDR::write_8 (const ACE_CDR::ULongLong *)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (ACE_CDR::LONGLONG_SIZE);
   return true;
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_16 (const ACE_CDR::LongDouble *x)
+ACE_SizeCDR::write_16 (const ACE_CDR::LongDouble *)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
                 ACE_CDR::LONGDOUBLE_ALIGN);
   return true;
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_wchar_array_i (const ACE_CDR::WChar *x,
+ACE_SizeCDR::write_wchar_array_i (const ACE_CDR::WChar *,
                                     ACE_CDR::ULong length)
 {
-  ACE_UNUSED_ARG (x);
-
   if (length == 0)
     return true;
 
-  const size_t align = (ACE_OutputCDR::wchar_maxbytes () == 2) ?
+  size_t const align = (ACE_OutputCDR::wchar_maxbytes () == 2) ?
     ACE_CDR::SHORT_ALIGN :
     ACE_CDR::OCTET_ALIGN;
 
@@ -204,13 +197,11 @@ ACE_SizeCDR::write_wchar_array_i (const ACE_CDR::WChar *x,
 
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_array (const void *x,
+ACE_SizeCDR::write_array (const void *,
                           size_t size,
                           size_t align,
                           ACE_CDR::ULong length)
 {
-  ACE_UNUSED_ARG (x);
-
   if (length == 0)
     return true;
 
@@ -219,10 +210,9 @@ ACE_SizeCDR::write_array (const void *x,
 }
 
 ACE_CDR::Boolean
-ACE_SizeCDR::write_boolean_array (const ACE_CDR::Boolean* x,
+ACE_SizeCDR::write_boolean_array (const ACE_CDR::Boolean*,
                                   ACE_CDR::ULong length)
 {
-  ACE_UNUSED_ARG (x);
   this->adjust (length, 1);
   return true;
 }
diff --git a/ACE/ace/CDR_Size.inl b/ACE/ace/CDR_Size.inl
index 90197379cab..2527af22989 100644
--- a/ACE/ace/CDR_Size.inl
+++ b/ACE/ace/CDR_Size.inl
@@ -194,7 +194,7 @@ ACE_SizeCDR::write_short_array (const ACE_CDR::Short *x,
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_SizeCDR::write_ushort_array (const ACE_CDR::UShort *x,
-                                   ACE_CDR::ULong length)
+                                 ACE_CDR::ULong length)
 {
   return this->write_array (x,
                             ACE_CDR::SHORT_SIZE,
@@ -204,7 +204,7 @@ ACE_SizeCDR::write_ushort_array (const ACE_CDR::UShort *x,
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_SizeCDR::write_long_array (const ACE_CDR::Long *x,
-                                 ACE_CDR::ULong length)
+                               ACE_CDR::ULong length)
 {
   return this->write_array (x,
                             ACE_CDR::LONG_SIZE,
@@ -214,7 +214,7 @@ ACE_SizeCDR::write_long_array (const ACE_CDR::Long *x,
 
 ACE_INLINE ACE_CDR::Boolean
 ACE_SizeCDR::write_ulong_array (const ACE_CDR::ULong *x,
-                                  ACE_CDR::ULong length)
+                                ACE_CDR::ULong length)
 {
   return this->write_array (x,
                             ACE_CDR::LONG_SIZE,
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 4c95bdf13e0..e1028df6401 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -104,12 +104,9 @@ public:
                  ACE_Allocator* buffer_allocator = 0,
                  ACE_Allocator* data_block_allocator = 0,
                  ACE_Allocator* message_block_allocator = 0,
-                 size_t memcpy_tradeoff =
-                 ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                 ACE_CDR::Octet major_version =
-                 ACE_CDR_GIOP_MAJOR_VERSION,
-                 ACE_CDR::Octet minor_version =
-                 ACE_CDR_GIOP_MINOR_VERSION);
+                 size_t memcpy_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
+                 ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                 ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Build a CDR stream with an initial buffer, it will *not* remove
   /// <data>, since it did not allocated it.  It's important to be careful
@@ -128,12 +125,9 @@ public:
                  ACE_Allocator* buffer_allocator = 0,
                  ACE_Allocator* data_block_allocator = 0,
                  ACE_Allocator* message_block_allocator = 0,
-                 size_t memcpy_tradeoff=
-                   ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                 ACE_CDR::Octet giop_major_version =
-                   ACE_CDR_GIOP_MAJOR_VERSION,
-                 ACE_CDR::Octet giop_minor_version =
-                   ACE_CDR_GIOP_MINOR_VERSION);
+                 size_t memcpy_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
+                 ACE_CDR::Octet giop_major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                 ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Build a CDR stream with an initial data block, it will *not* remove
   /// <data_block>, since it did not allocated it.  It's important to be
@@ -149,23 +143,17 @@ public:
   ACE_OutputCDR (ACE_Data_Block *data_block,
                  int byte_order = ACE_CDR_BYTE_ORDER,
                  ACE_Allocator* message_block_allocator = 0,
-                 size_t memcpy_tradeoff=
-                 ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                 ACE_CDR::Octet giop_major_version =
-                 ACE_CDR_GIOP_MAJOR_VERSION,
-                 ACE_CDR::Octet giop_minor_version =
-                 ACE_CDR_GIOP_MINOR_VERSION);
+                 size_t memcpy_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
+                 ACE_CDR::Octet giop_major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                 ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Build a CDR stream with an initial Message_Block chain, it will
   /// *not* remove @a data, since it did not allocate it.
   ACE_OutputCDR (ACE_Message_Block *data,
                  int byte_order = ACE_CDR_BYTE_ORDER,
-                 size_t memcpy_tradeoff =
-                   ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                 ACE_CDR::Octet giop_major_version =
-                   ACE_CDR_GIOP_MAJOR_VERSION,
-                 ACE_CDR::Octet giop_minor_version =
-                   ACE_CDR_GIOP_MINOR_VERSION);
+                 size_t memcpy_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
+                 ACE_CDR::Octet giop_major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                 ACE_CDR::Octet giop_minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// destructor
   ~ACE_OutputCDR (void);
@@ -579,19 +567,15 @@ public:
   ACE_InputCDR (const char *buf,
                 size_t bufsiz,
                 int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                ACE_CDR_GIOP_MAJOR_VERSION,
-                ACE_CDR::Octet minor_version =
-                ACE_CDR_GIOP_MINOR_VERSION);
+                ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Create an empty input stream. The caller is responsible for
   /// putting the right data and providing the right alignment.
   ACE_InputCDR (size_t bufsiz,
                 int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                ACE_CDR_GIOP_MAJOR_VERSION,
-                ACE_CDR::Octet minor_version =
-                ACE_CDR_GIOP_MINOR_VERSION);
+                ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Create an input stream from an ACE_Message_Block
   /**
@@ -613,10 +597,8 @@ public:
   ACE_InputCDR (ACE_Data_Block *data,
                 ACE_Message_Block::Message_Flags flag = 0,
                 int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                ACE_CDR_GIOP_MAJOR_VERSION,
-                ACE_CDR::Octet minor_version =
-                ACE_CDR_GIOP_MINOR_VERSION);
+                ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /// Create an input stream from an ACE_Data_Block. It also sets the
   /// read and write pointers at the desired positions. This would be
@@ -627,10 +609,8 @@ public:
                 size_t read_pointer_position,
                 size_t write_pointer_position,
                 int byte_order = ACE_CDR_BYTE_ORDER,
-                ACE_CDR::Octet major_version =
-                ACE_CDR_GIOP_MAJOR_VERSION,
-                ACE_CDR::Octet minor_version =
-                ACE_CDR_GIOP_MINOR_VERSION);
+                ACE_CDR::Octet major_version = ACE_CDR_GIOP_MAJOR_VERSION,
+                ACE_CDR::Octet minor_version = ACE_CDR_GIOP_MINOR_VERSION);
 
   /**
    * These make a copy of the current stream state, but do not copy
diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index ba2fb84e314..585e1b04d5a 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -336,7 +336,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
     ACE_U_ONE_SECOND_IN_NSECS  +  static_cast<ACE_hrtime_t> (ts.tv_nsec);
 #else
   ACE_UNUSED_ARG (op);
-  const ACE_Time_Value now = ACE_OS::gettimeofday ();
+  ACE_Time_Value const now = ACE_OS::gettimeofday ();
 
   // Carefully create the return value to avoid arithmetic overflow
   // if ACE_hrtime_t is ACE_U_LongLong.
diff --git a/ACE/bin/tao_other_tests.lst b/ACE/bin/tao_other_tests.lst
index 28d01b36940..f4acf87866e 100644
--- a/ACE/bin/tao_other_tests.lst
+++ b/ACE/bin/tao_other_tests.lst
@@ -158,7 +158,7 @@ TAO/examples/ior_corbaloc/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/utils/nslist/run_test.pl: !ST !SUNCC5_1 !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl: !NO_MESSAGING !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/orbsvcs/tests/IOR_MCast/run_test_ipv6.pl: IPV6 !NO_MCAST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
+TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: !ST !CORBA_E_MICRO
 TAO/orbsvcs/examples/Notify/Filter/run_test.pl: !ST !NO_MESSAGING !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO