Merge pull request #2403 from jwillemsen/jwi-throw_stub_exception

Removed throw_stub_exception, not used anymore, use nullptr in some p…

Author: jwillemsen

TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h

@@ -52,10 +52,10 @@ namespace TAO
       /// Constructor. @a arg parameter is used to pass any special
       /// state/info to the service handler upon creation.  Currently used
       /// by HTIOP to pass protocol configuration properties.
-      Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
-                                 TAO_ORB_Core* orb_core = 0,
-                                 void *arg = 0,
-                                 CORBA::Boolean flag = 0);
+      Connect_Creation_Strategy (ACE_Thread_Manager * = nullptr,
+                                 TAO_ORB_Core* orb_core = nullptr,
+                                 void *arg = nullptr,
+                                 CORBA::Boolean flag = false);
 
       /// Makes HTIOP_Client_Connection_Handlers
       virtual int make_svc_handler (SVC_HANDLER *&sh);

TAO/tao/CDR.cpp

@@ -182,28 +182,6 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block,
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR5_ENTER);
 }
 
-void
-TAO_OutputCDR::throw_stub_exception (int error_num)
-{
-  switch (error_num)
-    {
-    case EINVAL : // wchar from a GIOP 1.0
-      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 5, CORBA::COMPLETED_NO);
-      ACE_NOTREACHED (break);
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1,
-                                         CORBA::COMPLETED_NO);
-      ACE_NOTREACHED (break);
-#endif
-    case EACCES : // wchar but no codeset
-      throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
-      ACE_NOTREACHED (break);
-    default :
-      throw ::CORBA::MARSHAL ();
-    }
-}
-
 void
 TAO_OutputCDR::throw_skel_exception (int error_num )
 {
@@ -302,27 +280,6 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
 {
 }
 
-void
-TAO_InputCDR::throw_stub_exception (int error_num )
-{
-  switch (error_num)
-    {
-    case EINVAL : // wchar from a GIOP 1.0
-      throw ::CORBA::MARSHAL (CORBA::OMGVMCID | 6, CORBA::COMPLETED_YES);
-      ACE_NOTREACHED(break);
-#if (ERANGE != EINVAL)
-    case ERANGE : // untranslatable character
-      throw ::CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES);
-      ACE_NOTREACHED(break);
-#endif
-    case EACCES : // wchar but no codeset
-      throw ::CORBA::INV_OBJREF (CORBA::OMGVMCID | 2, CORBA::COMPLETED_YES);
-      ACE_NOTREACHED(break);
-    default :
-      throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES);
-    }
-}
-
 void
 TAO_InputCDR::throw_skel_exception (int error_num )
 {

TAO/tao/CDR.h

@@ -111,9 +111,9 @@ class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
   /// buffer, if @a size == 0 it allocates the default size.
   TAO_OutputCDR (size_t size = 0,
                  int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 ACE_Allocator* message_block_allocator = 0,
+                 ACE_Allocator* buffer_allocator = nullptr,
+                 ACE_Allocator* data_block_allocator = nullptr,
+                 ACE_Allocator* message_block_allocator = nullptr,
                  size_t memcpy_tradeoff = 0,
                  ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                  ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR);
@@ -123,9 +123,9 @@ class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
   TAO_OutputCDR (char *data,
                  size_t size,
                  int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* buffer_allocator = 0,
-                 ACE_Allocator* data_block_allocator = 0,
-                 ACE_Allocator* message_block_allocator = 0,
+                 ACE_Allocator* buffer_allocator = nullptr,
+                 ACE_Allocator* data_block_allocator = nullptr,
+                 ACE_Allocator* message_block_allocator = nullptr,
                  size_t memcpy_tradeoff = 0,
                  ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                  ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR);
@@ -156,9 +156,9 @@ class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
   /// @a data, since it did not allocated it.
   TAO_OutputCDR (ACE_Data_Block *data,
                  int byte_order = ACE_CDR_BYTE_ORDER,
-                 ACE_Allocator* message_block_allocator = 0,
+                 ACE_Allocator* message_block_allocator = nullptr,
                  size_t memcpy_tradeoff = 0,
-                 TAO_GIOP_Fragmentation_Strategy * fs = 0,
+                 TAO_GIOP_Fragmentation_Strategy * fs = nullptr,
                  ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                  ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR);
 
@@ -169,7 +169,6 @@ class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
   // strings and wstrings?
 
   // = TAO specific methods.
-  static void throw_stub_exception (int error_num);
   static void throw_skel_exception (int error_num);
 
   void get_version (TAO_GIOP_Message_Version& giop_version);
@@ -329,22 +328,22 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   /// Create an empty input stream. The caller is responsible for
   /// putting the right data and providing the right alignment.
   TAO_InputCDR (size_t bufsiz,
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   /// Create an input stream from an ACE_Message_Block
   TAO_InputCDR (const ACE_Message_Block *data,
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   /// Create an input stream from an ACE_Message_Block with an optional lock
   /// used to protect the data.
@@ -353,7 +352,7 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
 
   /// Create an input stream from an ACE_Data_Block
@@ -362,7 +361,7 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   /// Create an input stream from an ACE_Data_Block
   TAO_InputCDR (ACE_Data_Block *data,
@@ -372,7 +371,7 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
                 int byte_order = ACE_CDR_BYTE_ORDER,
                 ACE_CDR::Octet major_version = TAO_DEF_GIOP_MAJOR,
                 ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   /**
    * Make a copy of the current stream state, but does not copy the
@@ -389,7 +388,7 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
   /**
    * This creates an encapsulated stream, the first byte must be (per
    * the spec) the byte order of the encapsulation.  The default
-   * values for the allocators in this constructor are not 0, but are
+   * values for the allocators in this constructor are not nullptr, but are
    * generated by the ORB. Refer to the constructor body in CDR.cpp
    * for the code that supplies these values to the base class
    * constructor.
@@ -399,15 +398,15 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
 
   /// Create an input CDR from an output CDR.
   TAO_InputCDR (const TAO_OutputCDR& rhs,
-                ACE_Allocator* buffer_allocator = 0,
-                ACE_Allocator* data_block_allocator = 0,
-                ACE_Allocator* message_block_allocator = 0,
-                TAO_ORB_Core* orb_core = 0);
+                ACE_Allocator* buffer_allocator = nullptr,
+                ACE_Allocator* data_block_allocator = nullptr,
+                ACE_Allocator* message_block_allocator = nullptr,
+                TAO_ORB_Core* orb_core = nullptr);
 
   /// Initialize the contents of one CDR from another, without data
   /// copying and with minimum locking overhead.
   TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs,
-                TAO_ORB_Core* orb_core = 0);
+                TAO_ORB_Core* orb_core = nullptr);
 
   TAO_InputCDR& operator= (const TAO_InputCDR&) = default;
 
@@ -419,11 +418,9 @@ class TAO_Export TAO_InputCDR : public ACE_InputCDR
   /// Accessor
   TAO_ORB_Core *orb_core () const;
 
-  ACE_Message_Block::Message_Flags
-    clr_mb_flags( ACE_Message_Block::Message_Flags less_flags );
+  ACE_Message_Block::Message_Flags clr_mb_flags(ACE_Message_Block::Message_Flags less_flags);
 
   // = TAO specific methods.
-  static void throw_stub_exception (int error_num);
   static void throw_skel_exception (int error_num);
 
   /// These methods are used by valuetype indirection support.

TAO/tao/Connector_Impl.h

@@ -45,8 +45,8 @@ class TAO_Connect_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
 {
 public:
   /// Constructor.
-  TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = 0,
-                                 TAO_ORB_Core* orb_core = 0);
+  TAO_Connect_Creation_Strategy (ACE_Thread_Manager * = nullptr,
+                                 TAO_ORB_Core* orb_core = nullptr);
 
   /// Makes TAO_*_Client_Connection_Handlers
   virtual int make_svc_handler (SVC_HANDLER *&sh);