diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-30 22:51:33 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-30 22:51:33 +0000 |
| commit | 9e1e2bcdb4b8a27a0fa1c68ad61bdb5863795832 (patch) | |
| tree | db9d9607a5075593fb18790cd61db630aaae0a0a | |
| parent | 858f30c66a1180b4fe117df4acd309d3536e1c72 (diff) | |
| download | ATCD-9e1e2bcdb4b8a27a0fa1c68ad61bdb5863795832.tar.gz | |
Added a missing branch where only a warning is given for a case
difference only name clash.
| -rw-r--r-- | TAO/TAO_IDL/util/utl_scope.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index a2130d159eb..63d0c474bca 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -1480,10 +1480,11 @@ UTL_Scope::add_to_local_types(AST_Decl *e) // Has this node been referenced here before? idl_bool -UTL_Scope::referenced (AST_Decl *e, Identifier *id) +UTL_Scope::referenced (AST_Decl *e, + Identifier *id) { - long i = pd_referenced_used; - AST_Decl **tmp = pd_referenced; + long i = pd_referenced_used; + AST_Decl **tmp = pd_referenced; Identifier *member = 0; Identifier *test = 0; @@ -1533,8 +1534,20 @@ UTL_Scope::referenced (AST_Decl *e, Identifier *id) } else if (id->case_compare_quiet (*name_tmp) == I_TRUE) { - idl_global->err ()->name_case_error (id->get_string (), - (*name_tmp)->get_string ()); + if (idl_global->case_diff_error ()) + { + idl_global->err ()->name_case_error ( + id->get_string (), + (*name_tmp)->get_string () + ); + } + else + { + idl_global->err ()->name_case_warning ( + id->get_string (), + (*name_tmp)->get_string () + ); + } return I_TRUE; } |