summaryrefslogtreecommitdiff
path: root/TAO/tao/DynamicInterface
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/DynamicInterface')
-rw-r--r--TAO/tao/DynamicInterface/Context.cpp2
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments.cpp8
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments.h8
-rw-r--r--TAO/tao/DynamicInterface/DII_Invocation.cpp11
-rw-r--r--TAO/tao/DynamicInterface/Dynamic_Implementation.cpp4
-rw-r--r--TAO/tao/DynamicInterface/Dynamic_Implementation.h18
-rw-r--r--TAO/tao/DynamicInterface/ExceptionList.cpp2
-rw-r--r--TAO/tao/DynamicInterface/Request.cpp4
-rw-r--r--TAO/tao/DynamicInterface/Request.h2
-rw-r--r--TAO/tao/DynamicInterface/Server_Request.cpp8
-rw-r--r--TAO/tao/DynamicInterface/Unknown_User_Exception.cpp20
-rw-r--r--TAO/tao/DynamicInterface/Unknown_User_Exception.h3
12 files changed, 41 insertions, 49 deletions
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 96b5c1be43b..2e47f392f5f 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
Context,
"$Id$")
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/Environment.h"
#include "tao/CORBA_String.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index f4f6941ad97..02b362ed53b 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -2,11 +2,11 @@
#include "DII_Arguments.h"
-#include "tao/NVList.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
#include "tao/Exception.h"
#include "tao/CDR.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
ACE_RCSID (DynamicInterface,
DII_Arguments,
@@ -44,7 +44,7 @@ namespace TAO
}
void
- NamedValue_Argument::interceptor_result (CORBA::Any *any)
+ NamedValue_Argument::interceptor_value (CORBA::Any *any) const
{
(*any) <<= *this->x_->value ();
}
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index b15ccca1a03..cf681244b44 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -42,14 +42,14 @@ namespace TAO
*
* @brief Class for the return value of a CORBA::(Server)Request.
*/
- class NamedValue_Argument : public Argument
+ class NamedValue_Argument : public RetArgument
{
public:
NamedValue_Argument (CORBA::NamedValue_ptr);
virtual CORBA::Boolean demarshal (TAO_InputCDR &);
- virtual void interceptor_result (CORBA::Any *);
+ virtual void interceptor_value (CORBA::Any *any) const;
int byte_order (void) const;
@@ -65,13 +65,13 @@ namespace TAO
*
* @brief Class for the argument list of a CORBA::(Server)Request.
*/
- class NVList_Argument : public Argument
+ class NVList_Argument : public InArgument
{
public:
NVList_Argument (CORBA::NVList_ptr,
bool lazy_eval);
- virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+ virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
virtual CORBA::Boolean demarshal (TAO_InputCDR &);
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 794f3b95271..f07ff022182 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -7,18 +7,21 @@
#include "Request.h"
#include "DII_Reply_Dispatcher.h"
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/operation_details.h"
-#include "tao/RequestInfo_Util.h"
#include "tao/Invocation_Utils.h"
#include "tao/debug.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "tao/Profile_Transport_Resolver.h"
#include "tao/ORB_Constants.h"
#include "ace/OS_NS_string.h"
+#if TAO_HAS_INTERCEPTORS == 1
+# include "tao/PI/RequestInfo_Util.h"
+#endif
+
ACE_RCSID (DynamicInterface,
DII_Invocation,
"$Id$")
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index fccf4777bde..e8fa30d8e3f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -98,7 +98,7 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
// exception. See the CORBA C++ mapping, section 1.38.3.
TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
static_cast <TAO::Portable_Server::POA_Current_Impl *>
- (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+ (TAO_TSS_Resources::instance ()->poa_current_impl_);
if (poa_current_impl == 0
|| this != poa_current_impl->servant ())
@@ -199,7 +199,7 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
// exception. See the CORBA C++ mapping, section 1.38.3.
TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
static_cast <TAO::Portable_Server::POA_Current_Impl *>
- (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+ (TAO_TSS_Resources::instance ()->poa_current_impl_);
if (poa_current_impl == 0
|| this != poa_current_impl->servant ())
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 9c50fc9ce95..7e7ed6c0c67 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -39,17 +39,19 @@ namespace CORBA
typedef ServerRequest *ServerRequest_ptr;
}
+/**
+ * @class TAO_DynamicImplementation
+ *
+ * @brief Base class for DSI.
+ *
+ * It is expected that the <invoke> and <_primary_interface>
+ * methods will be only invoked by the POA in the context of
+ * serving a CORBA request. Invoking this method in other
+ * circumstances may lead to unpredictable results.
+ */
class TAO_DynamicInterface_Export TAO_DynamicImplementation
: public virtual TAO_ServantBase
{
- // = TITLE
- // Base class for DSI.
- //
- // = DESCRIPTION
- // It is expected that the <invoke> and <_primary_interface>
- // methods will be only invoked by the POA in the context of
- // serving a CORBA request. Invoking this method in other
- // circumstances may lead to unpredictable results.
public:
/// The invoke() method receives requests issued to any CORBA object
/// incarnated by the DSI servant and performs the processing
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 34445946608..38b90ffec8f 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
ExceptionList,
"$Id$")
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
#include "tao/Environment.h"
#include "tao/SystemException.h"
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index c51c7b0f4f3..5e57536a687 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -10,10 +10,10 @@ ACE_RCSID (DynamicInterface,
#include "DII_Arguments.h"
#include "Context.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
#include "tao/Object.h"
#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 3dad44d123a..32cf720983b 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -35,7 +35,7 @@
#include "tao/Environment.h"
#include "tao/Sequence.h"
#include "tao/CDR.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
#include "ace/SString.h"
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 6bd85a21e5e..3a142008626 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -8,11 +8,11 @@ ACE_RCSID (DynamicInterface,
Server_Request,
"$Id$")
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
#include "tao/GIOP_Utils.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
#include "tao/SystemException.h"
#if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 57107224f2c..bcc01200d6a 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -2,12 +2,12 @@
#include "Unknown_User_Exception.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
#include "tao/SystemException.h"
#include "ace/OS_NS_string.h"
@@ -55,16 +55,6 @@ CORBA::UnknownUserException::exception (void)
return *this->exception_;
}
-int
-CORBA::UnknownUserException::_is_a (const char *interface_id) const
-{
- return
- ((ACE_OS::strcmp (interface_id,
- "IDL:omg.org/CORBA/UnknownUserException:1.0")
- == 0)
- || UserException::_is_a (interface_id));
-}
-
CORBA::UnknownUserException *
CORBA::UnknownUserException::_downcast (CORBA::Exception *ex)
{
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 91d06d3e7a0..1976000db16 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -89,9 +89,6 @@ namespace CORBA
// = TAO specific extension.
- /// Helper method to implement _downcast.
- virtual int _is_a (const char *type_id) const;
-
/// This class has a specific typecode.
virtual CORBA::TypeCode_ptr _tao_type (void) const;
View Lorry Controller Status