summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/tao/Environment.cpp6
-rw-r--r--TAO/tao/Exception.cpp1
-rw-r--r--TAO/tao/POAC.cpp28
-rw-r--r--TAO/tao/debug.cpp4
4 files changed, 20 insertions, 19 deletions
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 9f0815f16ab..ee53ddbe3b4 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -188,9 +188,9 @@ CORBA::Environment::print_exception (const char *info,
ACE_DEBUG ((LM_ERROR,
"(%P|%t) minor code = %x, completed = %s\n",
x2->minor (),
- (x2->completion () == CORBA::COMPLETED_YES) ? "YES" :
- (x2->completion () == CORBA::COMPLETED_NO) ? "NO" :
- (x2->completion () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
+ (x2->completed () == CORBA::COMPLETED_YES) ? "YES" :
+ (x2->completed () == CORBA::COMPLETED_NO) ? "NO" :
+ (x2->completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
"garbage"));
}
else
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index f1ce81b7b26..40ee7c1dee8 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -300,6 +300,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
// held! The <CORBA::ORB_init> method is responsible for ensuring
// this.
static const char *minor = "minor";
+ // @@ NW should this be "completed" or "completion"?
static const char *completion = "completion";
// Create a CDR stream ... juggle the alignment here a bit, we know
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index 476eb7b8b92..d4cfe2b4ca1 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -67,7 +67,7 @@ PortableServer::ForwardRequest::~ForwardRequest (void)
// copy constructor
PortableServer::ForwardRequest::ForwardRequest (const PortableServer::ForwardRequest &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
}
@@ -950,7 +950,7 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
// copy constructor
PortableServer::POAManager::AdapterInactive::AdapterInactive (const PortableServer::POAManager::AdapterInactive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1332,7 +1332,7 @@ PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
// copy constructor
PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1428,7 +1428,7 @@ PortableServer::POA::AdapterInactive::~AdapterInactive (void)
// copy constructor
PortableServer::POA::AdapterInactive::AdapterInactive (const PortableServer::POA::AdapterInactive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1524,7 +1524,7 @@ PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
// copy constructor
PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const PortableServer::POA::AdapterNonExistent &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1621,7 +1621,7 @@ PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
// copy constructor
PortableServer::POA::InvalidPolicy::InvalidPolicy (const PortableServer::POA::InvalidPolicy &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
this->index = _tao_excp.index;
}
@@ -1729,7 +1729,7 @@ PortableServer::POA::NoServant::~NoServant (void)
// copy constructor
PortableServer::POA::NoServant::NoServant (const PortableServer::POA::NoServant &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1828,7 +1828,7 @@ PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
// copy constructor
PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -1925,7 +1925,7 @@ PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
// copy constructor
PortableServer::POA::ObjectNotActive::ObjectNotActive (const PortableServer::POA::ObjectNotActive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -2022,7 +2022,7 @@ PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
// copy constructor
PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -2119,7 +2119,7 @@ PortableServer::POA::ServantNotActive::~ServantNotActive (void)
// copy constructor
PortableServer::POA::ServantNotActive::ServantNotActive (const PortableServer::POA::ServantNotActive &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -2216,7 +2216,7 @@ PortableServer::POA::WrongAdapter::~WrongAdapter (void)
// copy constructor
PortableServer::POA::WrongAdapter::WrongAdapter (const PortableServer::POA::WrongAdapter &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -2313,7 +2313,7 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void)
// copy constructor
PortableServer::POA::WrongPolicy::WrongPolicy (const PortableServer::POA::WrongPolicy &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
@@ -2467,7 +2467,7 @@ PortableServer::Current::NoContext::~NoContext (void)
// copy constructor
PortableServer::Current::NoContext::NoContext (const PortableServer::Current::NoContext &_tao_excp)
- : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completion ())
+ : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
{
}
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 0873696ec93..0dd77a56140 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -226,9 +226,9 @@ _dmsg_x (CORBA::Environment &env,
emit_prefix (debug_stream);
ACE_OS::fprintf (debug_stream,
- "minor %#lx, completion %#lx\n",
+ "minor %#lx, completed %#lx\n",
sysex->minor (),
- (long) sysex->completion ());
+ (long) sysex->completed ());
}
funlockfile (debug_stream);
View Lorry Controller Status