diff options
| author | gokhale <asgokhale@users.noreply.github.com> | 1998-11-15 14:53:08 +0000 |
|---|---|---|
| committer | gokhale <asgokhale@users.noreply.github.com> | 1998-11-15 14:53:08 +0000 |
| commit | fe34ee15f8bf6fa1592915950c7f862e82b7a1a4 (patch) | |
| tree | a8c36fa87dd8a9769f0dcfb9ebb78818bcecfd71 /TAO | |
| parent | ef074269342f8326c8fdfa8c9133e5267378839d (diff) | |
| download | ATCD-fe34ee15f8bf6fa1592915950c7f862e82b7a1a4.tar.gz | |
*** empty log message ***
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_module.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/Typecode.cpp | 4 |
3 files changed, 24 insertions, 0 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index b6fbfcf0b77..b54fc0eb17e 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,16 @@ +Sun Nov 15 09:52:14 EST 1998 Aniruddha Gokhale <gokhale@sahyadri.research.bell-labs.com> + + * tao/TypeCode.cpp: + + Added a default clause to a switch statement in the TypeCode + constructor to prevent g++ warnings. Thanks to David Levine for + pointing this out to me. + + * TAO_IDL/ast/ast_module.cpp: + + Modifications to allow reopening of modules. Thanks to Hamish + Friedlander (hamishf@usa.net) for providing this fix. + Sat Nov 14 18:31:57 1998 Shawn Michael Atkins <sma1@lambada.cs.wustl.edu> * performance-tests/Thruput/TAO/new_run_test: new perl version of diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 907aa22d965..8bab07f277e 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -154,10 +154,17 @@ AST_Module *AST_Module::fe_add_module(AST_Module *t) idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d); return NULL; } + // if our platform supports namespaces, we allow reopening + // modules. However, if namespace support is not available, this is flagged + // as an error + +#ifndef ACE_HAS_USING_KEYWORD if (referenced(d)) { idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d); return NULL; } +#endif /* ACE_HAS_USING_KEYWORD */ + if (t->has_ancestor(d)) { idl_global->err()->redefinition_in_scope(t, d); return NULL; diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 789fe6df9d9..00011bd8e14 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -148,6 +148,10 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind) case CORBA::tk_any: this->private_state_->tc_size_ = sizeof (CORBA::Any); break; + default: + // we should never be here + this->private_state_->tc_size_known_ = 0; + break; } } |