diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 21:47:46 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 21:47:46 +0000 |
| commit | 66ab7942ea781d48efc803f1bda9ef8708b2dc41 (patch) | |
| tree | 1bf8368d550121dbf5f565477a62972cd282835a | |
| parent | b9d9a010525317def5f1a2d6dfe282dae924bfbe (diff) | |
| download | ATCD-66ab7942ea781d48efc803f1bda9ef8708b2dc41.tar.gz | |
ChangeLogTag: Fri Jan 18 15:41:22 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_decl.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 92d25f06138..a4cbc1d18ff 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -587,6 +587,7 @@ AST_Decl::repoID (char *value) // Forces version to be set to the last id component. delete [] this->version_; this->version_ = 0; + const char *dummy = this->version (); } else if (ACE_OS::strcmp (this->repoID_, value) != 0) { @@ -643,7 +644,8 @@ void AST_Decl::version (char *value) { // Previous #pragma version or #pragma id make this illegal. - if (this->version_ == 0 && this->repoID_ == 0) + if (this->version_ == 0 && this->repoID_ == 0 + || ACE_OS::strcmp (this->version_, value) == 0) { this->version_ = value; } diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 401045f22ee..299ad6eec4a 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -584,7 +584,7 @@ idl_store_pragma (char *buf) { idl_global->ident_string (buf + 8); } - else if (ACE_OS::strncmp (buf + 8, "id", 2) == 0) + else if (ACE_OS::strncmp (buf + 8, "ID", 2) == 0) { char *tmp = buf + 11; diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index b5a42cffb2c..eb51385a977 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -2656,7 +2656,7 @@ idl_store_pragma (char *buf) { idl_global->ident_string (buf + 8); } - else if (ACE_OS::strncmp (buf + 8, "id", 2) == 0) + else if (ACE_OS::strncmp (buf + 8, "ID", 2) == 0) { char *tmp = buf + 11; |