diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-03-22 00:37:01 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-03-22 00:37:01 +0000 |
| commit | f98127e99677939bec2644635ac7766a2cf51139 (patch) | |
| tree | fc3a8e108fed74f333c9c27a25b2d96c65e0f7e6 /TAO/tao | |
| parent | c3756e285abf706863df45b393d6d8908cab1140 (diff) | |
| download | ATCD-f98127e99677939bec2644635ac7766a2cf51139.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/interp.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/typecode.cpp | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/TAO/tao/interp.cpp b/TAO/tao/interp.cpp index 31a2a900f47..ee4db3ca22a 100644 --- a/TAO/tao/interp.cpp +++ b/TAO/tao/interp.cpp @@ -196,8 +196,10 @@ TAO_IIOP_Interpreter::init_table (void) // XXX workaround for G++ 2.6.3 bug // setup_entry (generic_enum, CORBA::tk_enum); - CORBA_TypeCode::table_ [CORBA::tk_enum].size_ = sizeof (generic_enum); - CORBA_TypeCode::table_ [CORBA::tk_enum].alignment_ = sizeof (generic_enum); + CORBA_IIOP_Interpreter::table_ [CORBA::tk_enum].size_ = + sizeof (generic_enum); + CORBA_IIOP_Interpreter::table_ [CORBA::tk_enum].alignment_ = + sizeof (generic_enum); setup_entry (CORBA::String, tk_string); setup_entry (TAO_opaque, tk_sequence); diff --git a/TAO/tao/typecode.cpp b/TAO/tao/typecode.cpp index f5b52c03463..5e9cde629b4 100644 --- a/TAO/tao/typecode.cpp +++ b/TAO/tao/typecode.cpp @@ -770,14 +770,16 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc, return 0; // compare repoIDs if they exist - if (ACE_OS::strlen (my_id) > 1 && ACE_OS::strlen (tc_id) > 1) - if (ACE_OS::strcmp (my_id, tc_id)) // not same - return 0; + if (ACE_OS::strlen (my_id) > 1 + && ACE_OS::strlen (tc_id) > 1 + && ACE_OS::strcmp (my_id, tc_id)) // not same + return 0; // compare names if they exist - if (ACE_OS::strlen (my_name) > 1 && ACE_OS::strlen (tc_name) > 1) - if (ACE_OS::strcmp (my_name, tc_name)) // not same - return 0; + if (ACE_OS::strlen (my_name) > 1 + && ACE_OS::strlen (tc_name) > 1 + && ACE_OS::strcmp (my_name, tc_name)) // not same + return 0; // check if the discriminant type is same CORBA::TypeCode_ptr my_discrim = this->discriminator_type (env); |