diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2023-01-27 14:41:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-27 14:41:41 -0600 |
| commit | f3832da16440b1eedbaba4dd4d324e8616cbcdbf (patch) | |
| tree | bd3c1adb2aa0bfe3941162f69896e8f6c386c4f4 | |
| parent | c08f3dcc20587b69def1f8348609055a9d5c3409 (diff) | |
| parent | 74264f1b59f08d84fb77f8bc5449da497b592776 (diff) | |
| download | ATCD-ace6tao2.tar.gz | |
Merge pull request #2038 from mitza-oci/ace6tao2ace6tao2
[TAO2] Merged TAO_IDL changes from #2008 and #2010
| -rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/fe_extern.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/fe_init.cpp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index b182ad6b988..c105c4956ed 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -73,11 +73,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "utl_err.h" #include "ace/Version.h" -#include "ace/Process_Manager.h" +#include "ace/Process.h" #include "ace/SString.h" #include "ace/Env_Value_T.h" #include "ace/ARGV.h" -#include "ace/UUID.h" #include "ace/Dirent.h" #include "ace/OS_NS_sys_stat.h" #include "ace/Truncate.h" diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp index 440d81cdc3c..224e102ae43 100644 --- a/TAO/TAO_IDL/fe/fe_extern.cpp +++ b/TAO/TAO_IDL/fe/fe_extern.cpp @@ -75,7 +75,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_root.h" -#include "ace/UUID.h" +#include "ace/OS_NS_stdio.h" extern int tao_yyparse (void); diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 4a02d0d6600..4d543af7d47 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -63,7 +63,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc. */ #include "ace/Env_Value_T.h" -#include "ace/UUID.h" #include "utl_scoped_name.h" #include "utl_identifier.h" |