diff options
Diffstat (limited to 'TAO/tao/PI_Server/PI_Server_Loader.cpp')
| -rw-r--r-- | TAO/tao/PI_Server/PI_Server_Loader.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index abc2da4613c..e3dacc74cfb 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "tao/PI_Server/PI_Server_Loader.h" -#include "tao/PI_Server/PortableServer_ORBInitializer.h" +#include "PI_Server_Loader.h" +#include "PortableServer_ORBInitializer.h" #include "tao/debug.h" #include "tao/ORB_Core.h" @@ -12,8 +12,6 @@ ACE_RCSID (PI_Server, PI_Server_Loader, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) { } @@ -29,13 +27,13 @@ TAO_PI_Server_Loader::init (int, { ACE_TRACE ("TAO_PI_Server_Loader::init"); - static bool initialized = false; + static int initialized = 0; // Only allow initialization once. if (initialized) return 0; - initialized = true; + initialized = 1; // Register the ORB initializer. ACE_DECLARE_NEW_CORBA_ENV; @@ -64,17 +62,14 @@ TAO_PI_Server_Loader::init (int, ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + "(%P | %t) Caught exception:"); return -1; } ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } -TAO_END_VERSIONED_NAMESPACE_DECL - ///////////////////////////////////////////////////////////////////// ACE_FACTORY_DEFINE (TAO_PI_Server, TAO_PI_Server_Loader) |