ChangelogTag: Sat Mar 30 09:39:40 UTC 2013 Martin Corino <mcorino@remedy.nl>

10 files changed, 38 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d21f1627a77..dcbbf7ce548 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Sat Mar 30 09:39:40 UTC 2013  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+        * performance-tests/POA/Object_Creation_And_Registration/registration.cpp:
+        * tao/PortableServer/Key_Adapters.cpp:
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+        * tests/File_IO/File_i.cpp:
+        * tests/NestedUpcall/MT_Client_Test/client.cpp:
+        * tests/POA/Default_Servant2/File_i.cpp:
+          Added MinGW64 compilers support.
+          All kinds of minor updates and corrections to silence
+          warnings and errors relating to either 64bit Windows or
+          the very latest GCC (4.8.0). Mostly precision loss and
+          truncating casts.
+
 Fri Mar 29 13:11:10 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/tao_versioning_idl_defaults.mpb:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 3154f1c4fde..920841f752c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -32,6 +32,7 @@
 #include "orbsvcs/CosEvent/CEC_Defaults.h"
 #include "orbsvcs/CosEvent/event_serv_export.h"
 #include "ace/Hash_Map_Manager.h"
+#include "ace/Truncate.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -108,7 +109,7 @@ public:
   {
   public:
     u_long operator() (PortableServer::ServantBase* const & ptr) const {
-      return reinterpret_cast<u_long> (ptr);
+      return ACE_Utils::truncate_cast<u_long> ((intptr_t)ptr);
     }
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 5d07ebec18f..3cc21b59de3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -35,6 +35,7 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
+#include "ace/Truncate.h"
 #include "ace/SString.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -117,7 +118,7 @@ public:
   {
   public:
     u_long operator() (PortableServer::ServantBase* const & ptr) const {
-      return reinterpret_cast<u_long> (ptr);
+      return ACE_Utils::truncate_cast<u_long> ((intptr_t)ptr);
     }
   };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 9dce3bc79f0..27e04d65611 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -160,8 +160,10 @@ TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x
 TAO_EC_ProxyPushConsumer_Collection*
 TAO_EC_Basic_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel_Base *)
 {
+#if defined (__SUNPRO_CC)
   // This typedef is a workaround for a SunCC 4.2 bug
   typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
+#endif
   return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator,
@@ -177,8 +179,10 @@ TAO_EC_Basic_Factory::destroy_proxy_push_consumer_collection (TAO_EC_ProxyPushCo
 TAO_EC_ProxyPushSupplier_Collection*
 TAO_EC_Basic_Factory::create_proxy_push_supplier_collection (TAO_EC_Event_Channel_Base *)
 {
+#if defined (__SUNPRO_CC)
   // This typedef is a workaround for a SunCC 4.2 bug
   typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator TAO_EC_Supplier_List_Iterator;
+#endif
   return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushSupplier,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushSupplier>::Iterator,
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index 3e769711f33..eb4703c1899 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -20,6 +20,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Truncate.h"
 
 //
 // The following macros help take a very precise look into the
@@ -172,7 +173,7 @@ reverse_map_effectiveness (test_i *servants)
   // Calculate the effectiveness of the hash.
   for (i = 0; i < iterations; i++)
     {
-      u_long hash_index = u_long (&servants[i]) % active_object_map_size;
+      u_long hash_index = ACE_Utils::truncate_cast<u_long> ((intptr_t)&servants[i]) % active_object_map_size;
       hash_counter[hash_index]++;
     }
 
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index 4d59ff4b642..c8c9d520c30 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -17,13 +17,14 @@ TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
 int
 TAO_Incremental_Key_Generator::operator() (PortableServer::ObjectId &id)
 {
+  const size_t cntr_size = sizeof this->counter_;
   // Resize to accommodate the counter.
-  id.length (sizeof this->counter_);
+  id.length (cntr_size);
 
   // Add new key data.
   ACE_OS::memcpy (id.get_buffer (),
                   &++this->counter_,
-                  sizeof this->counter_);
+                  cntr_size);
 
   // Success.
   return 0;
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index e9cd92fc9d0..2d7a1ff7861 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/INET_Addr.h"
+#include "ace/Truncate.h"
 #include "tao/IIOP_Connection_Handler.h"
 #include "tao/IIOP_Transport.h"
 #include "tao/Transport_Selection_Guard.h"
@@ -70,7 +71,7 @@ namespace TAO
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // Need to use cast to pacify windows compilers complaining
       // about the implicit HANDLE -> CORBA::Long conversion.
-      return (CORBA::Long) this->handler ()->get_handle ();
+      return ACE_Utils::truncate_cast<CORBA::Long> ((intptr_t)this->handler ()->get_handle ());
 #else
       throw ::CORBA::NO_IMPLEMENT ();
 #endif
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index 1776c7394c0..2e4690a6774 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Truncate.h"
 
 // IDL File::System constructor
 FileImpl::System::System (PortableServer::POA_ptr poa)
@@ -58,7 +59,7 @@ FileImpl::System::open (const char *file_name,
   // convert ACE_HANDLE to a string
   ACE_OS::sprintf (file_descriptor_buffer,
                    "%ld",
-                   (long int) file_descriptor);
+                   ACE_Utils::truncate_cast<long int> ((intptr_t)file_descriptor));
 
   //Create an objectID from the ACE_HANDLE string
   PortableServer::ObjectId_var oid =
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index b1d3f5db780..66a50c4fa4d 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -23,6 +23,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/Malloc_Base.h"
+#include "ace/Truncate.h"
 
 MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv,
                                 int client_number)
@@ -196,7 +197,7 @@ MT_Client::init (int argc, ACE_TCHAR **argv,
   try
     {
       char buf[64];
-      ACE_OS::sprintf (buf, "thread_%lx", reinterpret_cast<long> (this));
+      ACE_OS::sprintf (buf, "thread_%lx", ACE_Utils::truncate_cast<long> ((intptr_t)this));
 
       this->orb_var_ =
         CORBA::ORB_init (this->argc_,
diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp
index 8dadb95ddd7..ce33dc83da1 100644
--- a/TAO/tests/POA/Default_Servant2/File_i.cpp
+++ b/TAO/tests/POA/Default_Servant2/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Truncate.h"
 #include "tao/PortableServer/PortableServer.h"
 
 // IDL File::System constructor
@@ -60,7 +61,7 @@ FileImpl::System::open (const char *file_name,
   // convert ACE_HANDLE to a string
   ACE_OS::sprintf (file_descriptor_buffer,
                    "%ld",
-                   (long int) file_descriptor);
+                   ACE_Utils::truncate_cast<long int> ((intptr_t)file_descriptor));
 
   //Create an objectID from the ACE_HANDLE string
   PortableServer::ObjectId_var oid =