summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-06-17 19:17:04 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-06-17 19:17:04 +0000
commitdaa544f282c6c8b54734265ca056887fd70a796e (patch)
tree8869ccc183e57a467c0d23e36b04b6cd06c926d1
parente37aeeabadb7de2567fd0f23c2fc66636ebc8acf (diff)
downloadATCD-daa544f282c6c8b54734265ca056887fd70a796e.tar.gz
ChangeLogTag: Fri Jun 17 19:09:56 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog14
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp6
2 files changed, 14 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 327c1183062..453d597cac1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Jun 17 19:09:56 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/be/be_codegen.cpp:
+
+ Reverted the change of
+
+ Thu Jun 16 18:54:01 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ It seems this problem is appearing in other places besides
+ generated code, and that making lots of modifications to
+ TAO code to work around what is essentially an HP compiler
+ bug is not the right approach. Thanks to Johnny Willemsen
+ <jwillemsen@remedy.nl> for advice on this matter.
+
Fri Jun 17 17:58:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/ORB.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index f6c94d77db4..28f0364f3ff 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1604,12 +1604,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
this->gen_standard_include (this->client_stubs_,
"ace/Auto_Ptr.h");
}
-
- // Needed by HPUX when optimize=1.
-#if defined (HPUX)
- this->gen_standard_include (this->client_stubs_,
- "ace/SString.h");
-#endif /* HPUX */
}
void