diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-19 19:49:45 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-19 19:49:45 +0000 |
| commit | fb927d550042bd49781223211281495d2105aab2 (patch) | |
| tree | d999b32c383bfaae3b35cdbf922eb30d421a92b7 | |
| parent | b7b3efba5dca78782a74da25ba62de52f4742166 (diff) | |
| download | ATCD-fb927d550042bd49781223211281495d2105aab2.tar.gz | |
ChangeLogTag: Thu Dec 19 13:45:50 2002 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 29 |
2 files changed, 33 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 18973fe3f81..8f476494af2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 19 13:45:50 2002 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/util/utl_global.cpp: + + Added a patch sent in by Greg Mulyar <greg_mu@yahoo.com> to make sure that + the ACE version of gperf is used when both the ACE and GNU versions of + gperf are present. + Thu Dec 19 08:48:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * orbsvcs/tests/Security/Big_Request/Makefile: diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index cb3b96b3170..669688e6bc7 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -146,18 +146,39 @@ IDL_GlobalData::IDL_GlobalData (void) } else { +#if defined (ACE_GPERF) + const char ace_gperf[] = ACE_GPERF; + ACE_NEW (this->gperf_path_, + char [ACE_OS::strlen (ace_root) + + ACE_OS::strlen (ace_gperf) + + 1]); +# if defined (ACE_WIN32) + ACE_OS::sprintf (this->gperf_path_, + "%s\\bin\\%s", + ace_root, + ace_gperf); +# else /* Not ACE_WIN32 */ + ACE_OS::sprintf (this->gperf_path_, + "%s/bin/%s", + ace_root, + ace_gperf); +# endif /* ACE_WIN32 */ +#else /* Not ACE_GPERF */ // Set it to the default value. ACE_NEW (this->gperf_path_, - char [ACE_OS::strlen (ace_root) + ACE_OS::strlen ("/bin/gperf") + 1]); -#if defined (ACE_WIN32) + char [ACE_OS::strlen (ace_root) + + ACE_OS::strlen ("/bin/gperf") + + 1]); +# if defined (ACE_WIN32) ACE_OS::sprintf (this->gperf_path_, "%s\\bin\\gperf", ace_root); -#else /* Not ACE_WIN32 */ +# else /* Not ACE_WIN32 */ ACE_OS::sprintf (this->gperf_path_, "%s/bin/gperf", ace_root); -#endif /* ACE_WIN32 */ +# endif /* ACE_WIN32 */ +#endif /* ACE_GPERF */ } } |