summaryrefslogtreecommitdiff
path: root/TAO/tao/CurrentC.cpp
diff options
context:
space:
mode:
authornobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
committernobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-09-16 21:19:02 +0000
commit40fdc8a404e75ab03b68cc62e9987cf208fd8c30 (patch)
tree37d9c4d3abe4aefd8a34ed797883dd2cd4862ca7 /TAO/tao/CurrentC.cpp
parentc254b281f1b9a4ca19dd0c3ee73a0654a7718909 (diff)
downloadATCD-40fdc8a404e75ab03b68cc62e9987cf208fd8c30.tar.gz
This commit was manufactured by cvs2svn to create branchtypecode-overhaul
'typecode-overhaul'.
Diffstat (limited to 'TAO/tao/CurrentC.cpp')
-rw-r--r--TAO/tao/CurrentC.cpp29
1 files changed, 15 insertions, 14 deletions
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index dbd3f67136f..913d7394e52 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -58,7 +58,7 @@ namespace TAO
ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::duplicate (
+TAO::Objref_Traits<CORBA::Current>::tao_duplicate (
CORBA::Current_ptr p
)
{
@@ -67,7 +67,7 @@ TAO::Objref_Traits<CORBA::Current>::duplicate (
ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
void
-TAO::Objref_Traits<CORBA::Current>::release (
+TAO::Objref_Traits<CORBA::Current>::tao_release (
CORBA::Current_ptr p
)
{
@@ -76,14 +76,14 @@ TAO::Objref_Traits<CORBA::Current>::release (
ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
CORBA::Current_ptr
-TAO::Objref_Traits<CORBA::Current>::nil (void)
+TAO::Objref_Traits<CORBA::Current>::tao_nil (void)
{
return CORBA::Current::_nil ();
}
ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
CORBA::Boolean
-TAO::Objref_Traits<CORBA::Current>::marshal (
+TAO::Objref_Traits<CORBA::Current>::tao_marshal (
CORBA::Current_ptr p,
TAO_OutputCDR & cdr
)
@@ -92,7 +92,7 @@ TAO::Objref_Traits<CORBA::Current>::marshal (
}
// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
(*CORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
@@ -103,7 +103,7 @@ CORBA::Current::Current (void)
CORBA::Current::~Current (void)
{}
-void
+void
CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
{
Current *_tao_tmp_pointer =
@@ -121,10 +121,10 @@ CORBA::Current::_narrow (
{
return Current::_nil ();
}
-
+
Current_ptr proxy =
dynamic_cast<Current_ptr> (_tao_objref);
-
+
return Current::_duplicate (proxy);
}
@@ -138,10 +138,10 @@ CORBA::Current::_unchecked_narrow (
{
return Current::_nil ();
}
-
+
Current_ptr proxy =
dynamic_cast<Current_ptr> (_tao_objref);
-
+
return Current::_duplicate (proxy);
}
@@ -152,7 +152,7 @@ CORBA::Current::_duplicate (Current_ptr obj)
{
obj->_add_ref ();
}
-
+
return obj;
}
@@ -210,7 +210,7 @@ CORBA::Current::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T<
CORBA::Current
>;
-
+
template class
TAO_Objref_Out_T<
CORBA::Current
@@ -227,10 +227,11 @@ CORBA::Current::marshal (TAO_OutputCDR &)
TAO_Objref_Var_T< \
CORBA::Current
>
-
+
# pragma instantiate \
TAO_Objref_Out_T< \
CORBA::Current
>
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+