diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-26 21:28:56 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-26 21:28:56 +0000 |
| commit | e24dff4145040e71d2b7eaf2773d28ac132933d8 (patch) | |
| tree | e1dc0b92dce6d90f352836f47c29fb99c78b5e73 | |
| parent | b7f13abee5eedd74dfeba3d462b071487c0effed (diff) | |
| download | ATCD-e24dff4145040e71d2b7eaf2773d28ac132933d8.tar.gz | |
ChangeLogTag: Mon Aug 26 16:27:29 2002 Jeff Parsons <parsons@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3605ecd119f..55f1794a1d6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 26 16:27:29 2002 Jeff Parsons <parsons@cs.wustl.edu> + + * TAO_IDL/util/utl_global.cpp: + + Added one more check to handle a quirk of the SunCC + preprocessor. + Mon Aug 26 14:41:19 2002 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/fe/idl.ll: diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 645e92c89d6..6f127ad41f5 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -1069,7 +1069,10 @@ IDL_GlobalData::stripped_preproc_include (const char *name) // that *would* have been added for concatenation. char prefix_cap = this->idl_flags_[end - 1]; size_t skip_slash = (prefix_cap != '\\' && prefix_cap != '/'); - return c_name.substr (end - start + skip_slash).rep (); + char *retval = c_name.substr (end - start + skip_slash).rep (); + + // The Sun preprocessor adds a concatenating slash no matter what. + return retval + (retval[0] == '/'); } } |