summaryrefslogtreecommitdiff
path: root/TAO/tao/IORInterceptor
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IORInterceptor')
-rw-r--r--TAO/tao/IORInterceptor/IORInterceptorC.cpp21
-rw-r--r--TAO/tao/IORInterceptor/Makefile92
2 files changed, 60 insertions, 53 deletions
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 266e49721f2..deccc1afca4 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -39,6 +39,8 @@
#include "IORInterceptorC.i"
#endif /* !defined INLINE */
+#include "ace/OS_NS_string.h"
+
// TAO_IDL - Generated from
// be/be_visitor_arg_traits.cpp:60
@@ -200,7 +202,7 @@ TAO::Objref_Traits<PortableInterceptor::IORInterceptor>::tao_marshal (
}
// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
(*PortableInterceptor__TAO_IORInterceptor_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
@@ -221,10 +223,10 @@ PortableInterceptor::IORInterceptor::_narrow (
{
return IORInterceptor::_nil ();
}
-
+
IORInterceptor_ptr proxy =
dynamic_cast<IORInterceptor_ptr> (_tao_objref);
-
+
return IORInterceptor::_duplicate (proxy);
}
@@ -235,7 +237,7 @@ PortableInterceptor::IORInterceptor::_duplicate (IORInterceptor_ptr obj)
{
obj->_add_ref ();
}
-
+
return obj;
}
@@ -294,7 +296,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T<
PortableInterceptor::IORInterceptor
>;
-
+
template class
TAO_Objref_Out_T<
PortableInterceptor::IORInterceptor
@@ -306,7 +308,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T<
PortableInterceptor::IORInfo
>;
-
+
template class
TAO_Objref_Out_T<
PortableInterceptor::IORInfo
@@ -320,7 +322,7 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T< \
PortableInterceptor::IORInterceptor
>
-
+
# pragma instantiate \
TAO_Objref_Out_T< \
PortableInterceptor::IORInterceptor
@@ -332,11 +334,10 @@ PortableInterceptor::IORInterceptor::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T< \
PortableInterceptor::IORInfo
>
-
+
# pragma instantiate \
TAO_Objref_Out_T< \
PortableInterceptor::IORInfo
>
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IORInterceptor/Makefile b/TAO/tao/IORInterceptor/Makefile
index 49a0faea342..2e6afd7b328 100644
--- a/TAO/tao/IORInterceptor/Makefile
+++ b/TAO/tao/IORInterceptor/Makefile
@@ -188,8 +188,9 @@ endif
$(TAO_ROOT)/tao/IOP_CodecC.h \
$(TAO_ROOT)/tao/Typecode.h \
$(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
$(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor_String.h \
$(ACE_ROOT)/ace/Functor_T.cpp \
$(ACE_ROOT)/ace/Functor_T.i \
$(ACE_ROOT)/ace/Log_Msg.h \
@@ -206,6 +207,7 @@ endif
$(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
$(TAO_ROOT)/tao/Valuetype/ValueBase.h \
$(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+ $(TAO_ROOT)/tao/Valuetype/Value_CORBA_methods.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
$(ACE_ROOT)/ace/Null_Mutex.h \
@@ -392,8 +394,9 @@ endif
$(TAO_ROOT)/tao/IOP_CodecC.h \
$(TAO_ROOT)/tao/Typecode.h \
$(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
$(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor_String.h \
$(ACE_ROOT)/ace/Functor_T.cpp \
$(ACE_ROOT)/ace/Functor_T.i \
$(ACE_ROOT)/ace/Log_Msg.h \
@@ -410,6 +413,7 @@ endif
$(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
$(TAO_ROOT)/tao/Valuetype/ValueBase.h \
$(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+ $(TAO_ROOT)/tao/Valuetype/Value_CORBA_methods.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
$(ACE_ROOT)/ace/Null_Mutex.h \
@@ -487,31 +491,15 @@ endif
$(ACE_ROOT)/ace/ace_wchar.h \
$(ACE_ROOT)/ace/ace_wchar.inl \
$(ACE_ROOT)/ace/OS_main.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Global_Macros.h \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/os_include/os_errno.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/os_include/sys/os_types.h \
- $(ACE_ROOT)/ace/os_include/os_stddef.h \
- $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/PI_ForwardC.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(ACE_ROOT)/ace/Exception_Macros.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/Basic_Types.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/ACE_export.h IORInterceptorC.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/orbconf.h \
$(ACE_ROOT)/ace/Basic_Types.h \
$(ACE_ROOT)/ace/os_include/os_limits.h \
$(ACE_ROOT)/ace/os_include/os_unistd.h \
+ $(ACE_ROOT)/ace/os_include/sys/os_types.h \
+ $(ACE_ROOT)/ace/os_include/os_stddef.h \
$(ACE_ROOT)/ace/os_include/os_inttypes.h \
$(ACE_ROOT)/ace/os_include/os_stdint.h \
$(ACE_ROOT)/ace/os_include/os_stdio.h \
@@ -524,12 +512,28 @@ endif
$(ACE_ROOT)/ace/os_include/os_ucontext.h \
$(ACE_ROOT)/ace/os_include/sys/os_resource.h \
$(ACE_ROOT)/ace/os_include/sys/os_time.h \
- $(ACE_ROOT)/ace/Default_Constants.h \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(ACE_ROOT)/ace/iosfwd.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Global_Macros.h \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/os_include/os_errno.h \
$(ACE_ROOT)/ace/Synch_Traits.h \
$(ACE_ROOT)/ace/Lock.h \
+ $(ACE_ROOT)/ace/SStringfwd.h \
+ $(ACE_ROOT)/ace/iosfwd.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(ACE_ROOT)/ace/Exception_Macros.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/Basic_Types.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Default_Constants.h \
+ $(TAO_ROOT)/tao/objectid.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/IOP_IORC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/CORBA_String.h \
$(TAO_ROOT)/tao/default_environment.h \
$(TAO_ROOT)/tao/Sequence_T.h \
$(TAO_ROOT)/tao/Objref_VarOut_T.h \
@@ -550,11 +554,12 @@ endif
$(TAO_ROOT)/tao/Sequence_T.i \
$(TAO_ROOT)/tao/CDR.h \
$(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/SStringfwd.h \
$(ACE_ROOT)/ace/Message_Block.h \
$(ACE_ROOT)/ace/Time_Value.h \
$(ACE_ROOT)/ace/Message_Block_T.h \
$(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/os_include/sys/os_mman.h \
$(ACE_ROOT)/ace/Message_Block_T.i \
$(TAO_ROOT)/tao/Seq_Var_T.h \
$(TAO_ROOT)/tao/Seq_Var_T.cpp \
@@ -562,16 +567,6 @@ endif
$(TAO_ROOT)/tao/Seq_Out_T.h \
$(TAO_ROOT)/tao/Seq_Out_T.cpp \
$(TAO_ROOT)/tao/Seq_Out_T.inl \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
- $(TAO_ROOT)/tao/IOP_CodecC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/objectid.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/IOP_IORC.h \
$(TAO_ROOT)/tao/VarOut_T.h \
$(TAO_ROOT)/tao/VarOut_T.cpp \
$(TAO_ROOT)/tao/VarOut_T.inl \
@@ -601,10 +596,16 @@ endif
$(ACE_ROOT)/ace/Guard_T.inl \
$(ACE_ROOT)/ace/RW_Thread_Mutex.h \
$(ACE_ROOT)/ace/RW_Mutex.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/PI_ForwardC.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+ $(TAO_ROOT)/tao/IOP_CodecC.h \
$(TAO_ROOT)/tao/Typecode.h \
$(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
$(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor_String.h \
$(ACE_ROOT)/ace/Functor_T.cpp \
$(ACE_ROOT)/ace/Functor_T.i \
$(ACE_ROOT)/ace/Log_Msg.h \
@@ -617,11 +618,11 @@ endif
$(ACE_ROOT)/ace/Unbounded_Queue.cpp \
$(ACE_ROOT)/ace/Unbounded_Queue.inl \
$(TAO_ROOT)/tao/TC_Constants_Forward.h \
- IORInterceptor_Adapter_Impl.h IORInterceptorC.h \
$(TAO_ROOT)/tao/ObjRefTemplate/ObjectReferenceTemplateC.h \
$(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
$(TAO_ROOT)/tao/Valuetype/ValueBase.h \
$(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+ $(TAO_ROOT)/tao/Valuetype/Value_CORBA_methods.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
$(ACE_ROOT)/ace/Null_Mutex.h \
@@ -682,7 +683,10 @@ endif
$(TAO_ROOT)/tao/Valuetype/Sequence_T.h \
$(TAO_ROOT)/tao/Valuetype/Sequence_T.cpp \
$(TAO_ROOT)/tao/Valuetype/Sequence_T.inl \
- $(TAO_ROOT)/tao/IORInterceptor_Adapter.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(ACE_ROOT)/ace/Array_Base.inl \
IORInterceptor_List.inl
.obj/IORInterceptor_Adapter_Factory_Impl.o .obj/IORInterceptor_Adapter_Factory_Impl.so .shobj/IORInterceptor_Adapter_Factory_Impl.o .shobj/IORInterceptor_Adapter_Factory_Impl.so: \
@@ -810,8 +814,9 @@ endif
$(TAO_ROOT)/tao/IOP_CodecC.h \
$(TAO_ROOT)/tao/Typecode.h \
$(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
$(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor_String.h \
$(ACE_ROOT)/ace/Functor_T.cpp \
$(ACE_ROOT)/ace/Functor_T.i \
$(ACE_ROOT)/ace/Log_Msg.h \
@@ -828,6 +833,7 @@ endif
$(TAO_ROOT)/tao/ObjRefTemplate/ort_export.h \
$(TAO_ROOT)/tao/Valuetype/ValueBase.h \
$(TAO_ROOT)/tao/Valuetype/valuetype_export.h \
+ $(TAO_ROOT)/tao/Valuetype/Value_CORBA_methods.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.h \
$(TAO_ROOT)/tao/Valuetype/Value_VarOut_T.cpp \
$(ACE_ROOT)/ace/Null_Mutex.h \
View Lorry Controller Status