summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/LocalObject.cpp2
-rw-r--r--TAO/tao/LocalObject.h2
-rw-r--r--TAO/tao/Makefile4
-rw-r--r--TAO/tao/Makefile.am24
-rw-r--r--TAO/tao/Makefile.bor1
-rw-r--r--TAO/tao/Object.h1
-rw-r--r--TAO/tao/Object.i28
7 files changed, 30 insertions, 32 deletions
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index c5f585280e0..351e2ac11cb 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -72,7 +72,7 @@ CORBA::LocalObject::_hash (CORBA::ULong maximum,
// such as strcmp(), to allow more comparison algorithms.
CORBA::Boolean
-CORBA::LocalObject::_is_equivalent (CORBA::LocalObject_ptr other_obj,
+CORBA::LocalObject::_is_equivalent (CORBA::Object_ptr other_obj,
CORBA::Environment &)
ACE_THROW_SPEC (())
{
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index ed56de481af..58e6eb29455 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -162,7 +162,7 @@ public:
// different ORB protocols are in use) there is no default
// implementation.
- virtual CORBA::Boolean _is_equivalent (CORBA::LocalObject_ptr other_obj,
+ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ())
ACE_THROW_SPEC (());
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index d12e5fb98d8..882edee7260 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -93,7 +93,7 @@ PLUGGABLE_PROTOCOLS_FILES = \
SHMIOP_Connect \
IORC \
IORS \
- IORManipulation
+ IORManipulation
PLUGGABLE_MESSAGING_FILES = \
Pluggable_Messaging \
@@ -135,6 +135,7 @@ ORB_CORE_FILES = \
WrongTransactionC \
Environment \
Object \
+ LocalObject \
ObjectIDList \
ORB \
corbafwd \
@@ -160,7 +161,6 @@ ORB_CORE_FILES = \
Invocation \
operation_details \
Interceptor \
- InterceptorS \
InterceptorC \
Asynch_Invocation \
ORB_Core \
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 4070f138646..5ad6549b831 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -102,7 +102,6 @@ ORB_CORE_FILES = \
GIOP_Server_Request.cpp \
Invocation.cpp \
Interceptor.cpp \
- InterceptorS.cpp \
InterceptorC.cpp \
Asynch_Invocation.cpp \
ORB_Core.cpp \
@@ -175,32 +174,32 @@ libTAO_la_SOURCES = \
##
## This flag accepts an argument of the form `current[:revision[:age]]'. So,
## passing `-version-info 3:12:1' sets current to 3, revision to 12, and age
-## to 1.
+## to 1.
## If either revision or age are omitted, they default to 0. Also note that
-## age must be less than or equal to the current interface number.
+## age must be less than or equal to the current interface number.
##
## Here are a set of rules to help you update your library version
-## information:
+## information:
##
-## 1.Start with version information of `0:0:0' for each libtool library.
+## 1.Start with version information of `0:0:0' for each libtool library.
## 2.Update the version information only immediately before a public
## release of your software. More frequent updates are unnecessary, and
-## only guarantee that the current interface number gets larger faster.
+## only guarantee that the current interface number gets larger faster.
## 3.If the library source code has changed at all since the last update,
-## then increment revision (`c:r:a' becomes `c:r+1:a').
+## then increment revision (`c:r:a' becomes `c:r+1:a').
## 4.If any interfaces have been added, removed, or changed since the last
-## update, increment current, and set revision to 0.
+## update, increment current, and set revision to 0.
## 5.If any interfaces have been added since the last public release, then
-## increment age.
+## increment age.
## 6.If any interfaces have been removed since the last public release,
-## then set age to 0.
+## then set age to 0.
##
## Never try to set the interface numbers so that they correspond to the
## release number of your package. This is an abuse that only fosters
## misunderstanding of the purpose of library versions. Instead, use the
## `-release' flag (see section 6.4 Managing release information), but be
## warned that every release of your package will not be binary compatibility
-## with any other release.
+## with any other release.
## The below "-version-info" isn't being used the way libtool intends
## it to be used but we do it that way to make the version numbers
@@ -225,7 +224,7 @@ TEMPLATE_FILES = \
TimeBaseS_T.cpp \
varout.cpp
else
-TEMPLATE_FILES =
+TEMPLATE_FILES =
endif
IDL_HEADERS = \
@@ -503,4 +502,3 @@ EXTRA_DIST = \
clean-local:
-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 3789e0f6904..0cdf8466ebd 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -57,7 +57,6 @@ OBJFILES = \
$(OBJDIR)\InconsistentTypeCodeC.obj \
$(OBJDIR)\Interceptor.obj \
$(OBJDIR)\InterceptorC.obj \
- $(OBJDIR)\InterceptorS.obj \
$(OBJDIR)\InterfaceC.obj \
$(OBJDIR)\InterfaceS.obj \
$(OBJDIR)\Invocation.obj \
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 7127afe473e..e93a8aff3ac 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -47,6 +47,7 @@ public:
static CORBA_Object_ptr _nil (void);
// return a NUL object
+ ACE_INLINE_FOR_GNUC
static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ());
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 5d306195da3..dd1f0351da5 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -3,7 +3,7 @@
// ****************************************************************
ACE_INLINE
-CORBA::Object::Object (int)
+CORBA_Object::CORBA_Object (int)
: servant_ (0),
is_collocated_ (0),
is_local_ (1),
@@ -42,6 +42,12 @@ CORBA_Object::_duplicate (CORBA_Object_ptr obj)
return obj;
}
+ACE_INLINE CORBA::Boolean
+CORBA::is_nil (CORBA::Object_ptr obj)
+{
+ return obj == 0;
+}
+
// Null pointers represent nil objects.
ACE_INLINE CORBA_Object_ptr
@@ -51,12 +57,6 @@ CORBA_Object::_nil (void)
}
ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment&ACE_TRY_ENV)
-{
- return CORBA::Object::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA_Object_ptr
CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment&)
{
if (CORBA::is_nil (obj))
@@ -69,7 +69,13 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment&)
(ACE_reinterpret_cast (ptr_arith_t,
&CORBA::Object::_narrow)));
else
- return CORBA_Object::_duplicate (obj);
+ return CORBA::Object::_duplicate (obj);
+}
+
+ACE_INLINE CORBA_Object_ptr
+CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment&ACE_TRY_ENV)
+{
+ return CORBA_Object::_unchecked_narrow (obj, ACE_TRY_ENV);
}
ACE_INLINE TAO_Stub *
@@ -82,12 +88,6 @@ CORBA_Object::_stubobj (void) const
// ************************************************************
// These are in CORBA namespace
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Object_ptr obj)
-{
- return obj == 0;
-}
-
ACE_INLINE void
CORBA::release (CORBA_Object_ptr obj)
{
View Lorry Controller Status