diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-04 07:17:12 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-06-04 07:17:12 +0000 |
| commit | f6ac0a830649da61e1236140be2ceecf491f6aaa (patch) | |
| tree | d6153e63f8834b0865ad71993b4e0babd5775d29 /TAO/tao/Exception.cpp | |
| parent | 8e9ec6386dc710cf81e93e011979a3d5ca0646bb (diff) | |
| download | ATCD-f6ac0a830649da61e1236140be2ceecf491f6aaa.tar.gz | |
ChangeLogTag:Fri Jun 4 00:16:19 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Exception.cpp')
| -rw-r--r-- | TAO/tao/Exception.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 9d30ac66064..8b8338d3a3b 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -41,7 +41,7 @@ ACE_Allocator *TAO_Exceptions::global_allocator_; // Flag that denotes that the TAO TypeCode constants have been // initialized. -int TAO_Exceptions::initialized_ = 0; +bool TAO_Exceptions::initialized_ = false; // TAO specific typecode. extern CORBA::TypeCode_ptr TC_completion_status; @@ -658,7 +658,7 @@ CORBA::SystemException::_info (void) const } else if (VMCID == CORBA::OMGVMCID) { - CORBA::ULong minor_code = this->minor () & 0xFFFU; + const CORBA::ULong minor_code = this->minor () & 0xFFFU; const char *minor_description = 0; @@ -1169,7 +1169,7 @@ static CORBA::Long tc_buf_CORBA[TAO_TC_BUF_LEN / sizeof (CORBA::Long)]; static const CORBA::ULong array_sz = (sizeof (type_code_array) / sizeof (CORBA::TypeCode_ptr)) - 1; -static const char *repo_id_array [] = { +static const char *repo_id_array[] = { #define TAO_SYSTEM_EXCEPTION(name) \ (char *) "IDL:omg.org/CORBA/" #name ":1.0", STANDARD_EXCEPTION_LIST @@ -1193,7 +1193,7 @@ TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) // Not thread safe. Caller must provide synchronization. - if (TAO_Exceptions::initialized_ != 0) + if (TAO_Exceptions::initialized_) { return; } @@ -1202,9 +1202,9 @@ TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW (TAO_Exceptions::global_allocator_, ACE_New_Allocator); - char *name_array [] = { + static const char *name_array[] = { #define TAO_SYSTEM_EXCEPTION(name) \ - (char *) # name, + # name, STANDARD_EXCEPTION_LIST #undef TAO_SYSTEM_EXCEPTION 0 @@ -1223,7 +1223,7 @@ TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException ACE_ENV_ARG_PARAMETER); - TAO_Exceptions::initialized_ = 1; + TAO_Exceptions::initialized_ = true; } #undef TAO_TC_BUF_LEN |