More pre/post include changes

* docs/src/compilation.adoc: * tests/ami_test/ami_collocation/ami_test_i.h: * tests/ami_test/multiple_idl_ami/hello2.h:
RemedyIT · Apr 2, 2024 · df99636 · df99636
1 parent c4b0450
commit df99636
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/docs/src/compilation.adoc b/docs/src/compilation.adoc
@@ -17,8 +17,8 @@ command line options should be used when invoking the RIDL compiler.  +
  Command line options: +
 
 -----------------------------------
-        -Wb,pre_include=ace/pre.h
-        -Wb,post_include=ace/post.h
+        -Wb,pre_include=tao/x11/pre.h
+        -Wb,post_include=tao/x11/post.h
         -I$TAOX11_ROOT
         -Sci
         -Ssi
@@ -47,8 +47,8 @@ When a client needs to use <<ami/taox11_ami.adoc#,CORBA AMI>>, the following
 command line options should be applied to the RIDL compiler:
 
 -----------------------------------
-        -Wb,pre_include=ace/pre.h
-        -Wb,post_include=ace/post.h
+        -Wb,pre_include=tao/x11/pre.h
+        -Wb,post_include=tao/x11/post.h
         -I$TAOX11_ROOT
         -Sci
         -Ssi

diff --git a/tests/ami_test/ami_collocation/ami_test_i.h b/tests/ami_test/ami_collocation/ami_test_i.h
@@ -9,8 +9,6 @@
 #ifndef TAOX11_AMI_TEST_I_H
 #define TAOX11_AMI_TEST_I_H
 
-#include /**/ "ace/pre.h"
-
 #include "testlib/taox11_testlog.h"
 
 #include "ami_testS.h"
@@ -29,12 +27,8 @@ class AMI_TEST_Export AMI_Test_i
 
 private:
   int32_t in_l_last_;
-
-  const std::string in_str_;
-
-  const std::string in_str_last_;
+  std::string const in_str_;
+  std::string const in_str_last_;
 
 };
-#include /**/ "ace/post.h"
 #endif /* TAOX11_AMI_TEST_I_H */
-
diff --git a/tests/ami_test/multiple_idl_ami/hello2.h b/tests/ami_test/multiple_idl_ami/hello2.h
@@ -9,8 +9,6 @@
 #ifndef TAOX11_HELLO2_H
 #define TAOX11_HELLO2_H
 
-#include /**/ "ace/pre.h"
-
 #include "testlib/taox11_testlog.h"
 
 #include "hello2S.h"
@@ -44,6 +42,5 @@ class Hello :
   IDL::traits<CORBA::ORB>::ref_type orb_;
   IDL::traits<PortableServer::POA>::ref_type poa_;
 };
-#include /**/ "ace/post.h"
 #endif /* TAOX11_HELLO2_H */