diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-07 19:30:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-07 19:30:36 +0000 |
| commit | 7273a30d0da9c21fa8c6ab8225cee933247b1ad1 (patch) | |
| tree | 8989bc0400206fc753d9ada85d75bad30cdb0773 /TAO/tao/BiDir_GIOP | |
| parent | 4bcc8790c6a47aeb377f4862c1b68c5f7f1e2b23 (diff) | |
| download | ATCD-7273a30d0da9c21fa8c6ab8225cee933247b1ad1.tar.gz | |
Mon Aug 7 19:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/BiDir_GIOP')
| -rw-r--r-- | TAO/tao/BiDir_GIOP/BiDirGIOP.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/BiDir_GIOP/BiDirGIOP.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp index a4943a47b04..75158d45882 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp @@ -12,7 +12,7 @@ ACE_RCSID (BiDir_GIOP, TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Set the flag to zero to start with -int TAO_BiDirGIOP_Loader::is_activated_ = 0; +bool TAO_BiDirGIOP_Loader::is_activated_ = false; TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void) { @@ -26,7 +26,7 @@ int TAO_BiDirGIOP_Loader::init (int, ACE_TCHAR* []) { - if (TAO_BiDirGIOP_Loader::is_activated_ == 0 && TAO_DEF_GIOP_MINOR >= 2) + if (TAO_BiDirGIOP_Loader::is_activated_ == false && TAO_DEF_GIOP_MINOR >= 2) { PortableInterceptor::ORBInitializer_ptr tmp_orb_initializer = PortableInterceptor::ORBInitializer::_nil (); @@ -52,7 +52,7 @@ TAO_BiDirGIOP_Loader::init (int, ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - TAO_BiDirGIOP_Loader::is_activated_ = 1; + TAO_BiDirGIOP_Loader::is_activated_ = true; } ACE_CATCHANY { diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h index fce8ed7395e..f18a84ab0e1 100644 --- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h +++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h @@ -63,10 +63,10 @@ private: /// Flag to indicate whether the BiDirGIOP library has been /// activated. - static int is_activated_; + static bool is_activated_; }; -static int +static bool TAO_Requires_BiDirGIOP_Initializer = TAO_BiDirGIOP_Loader::Initializer (); TAO_END_VERSIONED_NAMESPACE_DECL |