Merge pull request #365 from jwillemsen/jwi-taox11prepost

Add taox11 pre.h/post.h to reduce header dependency on ACE
RemedyIT · Apr 2, 2024 · 4f7a644 · 4f7a644
2 parents 192454e + df99636
commit 4f7a644
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 35 deletions.
diff --git a/bin/MPC/config/ridl_base_defaults.mpb b/bin/MPC/config/ridl_base_defaults.mpb
@@ -37,7 +37,7 @@ project: taox11_basedefaults, taobaseidldefaults {
   after -= TAO_IDL_EXE
   idlflags -= $(TAO_IDLFLAGS)
   idlflags -= -Sa -St
-  idlflags += -Wb,pre_include=ace/pre.h \
-              -Wb,post_include=ace/post.h -I$(TAOX11_ROOT)
+  idlflags += -Wb,pre_include=tao/x11/pre.h \
+              -Wb,post_include=tao/x11/post.h -I$(TAOX11_ROOT)
   idlflags += $(RIDLCFLAGS) -Sci -Ssi -Sa -St
 }
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/tao/x11/PolicyC.h b/tao/x11/PolicyC.h
@@ -18,7 +18,7 @@
 #ifndef __RIDL_POLICYC_H_INCLUDED__
 #define __RIDL_POLICYC_H_INCLUDED__
 
-#include /**/ "ace/pre.h"
+#include /**/ "tao/x11/pre.h"
 
 #include "tao/x11/stddef.h"
 #include "tao/x11/basic_traits.h"
@@ -518,7 +518,7 @@ TAOX11_Export std::ostream& operator<< (
 #include "PolicyP.h"
 #endif
 
-#include /**/ "ace/post.h"
+#include /**/ "tao/x11/post.h"
 
 #endif // __RIDL_POLICYC_H_INCLUDED__
 

diff --git a/tao/x11/dynamic_any/dynany_impl.h b/tao/x11/dynamic_any/dynany_impl.h
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#include /**/ "ace/pre.h"
-
 #include "tao/x11/dynamic_any/dyn_common.h"
 
 #if defined (_MSC_VER)
@@ -85,5 +83,4 @@ namespace TAOX11_NAMESPACE
 # pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include /**/ "ace/post.h"
 #endif /* TAOX11_DYNANY_I_H */
diff --git a/tao/x11/pi/policyfactory_manager.h b/tao/x11/pi/policyfactory_manager.h
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include /**/ "ace/pre.h"
+#include /**/ "tao/x11/pre.h"
 
 #include "ace/Service_Config.h"
 #include "tao/x11/pi/taox11_pi_export.h"
@@ -48,7 +48,7 @@ namespace TAOX11_NAMESPACE
 
 #endif
 
-#include /**/ "ace/post.h"
+#include /**/ "tao/x11/post.h"
 
 #endif /* TAOX11_POLICYFACTORY_MANAGER_INCLUDED */
 
diff --git a/tao/x11/portable_server/sarg_traits_t.h b/tao/x11/portable_server/sarg_traits_t.h
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#include /**/ "ace/pre.h"
-
 #include "tao/x11/stddef.h"
 
 namespace TAOX11_NAMESPACE::PS
@@ -29,7 +27,4 @@ namespace TAOX11_NAMESPACE::PS
   };
 } // namespace TAOX11_NAMESPACE::PS
 
-
-#include /**/ "ace/post.h"
-
 #endif /* TAOX11_SARG_TRAITS_T_H */
diff --git a/tao/x11/portable_server/servant_proxy.h b/tao/x11/portable_server/servant_proxy.h
@@ -12,10 +12,6 @@
 
 #pragma once
 
-#include /**/ "ace/pre.h"
-
-#include /**/ "ace/config-all.h"
-
 #include "tao/x11/tao_corba.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
@@ -90,6 +86,4 @@ namespace TAOX11_NAMESPACE {
   };
 } // namespace TAOX11_NAMESPACE
 
-#include /**/ "ace/post.h"
-
 #endif // TAOX11_SERVANT_PROXY_H_INCLUDED
diff --git a/tao/x11/post.h b/tao/x11/post.h
@@ -0,0 +1,8 @@
+/**
+ * @file    post.h
+ * @author  Johnny Willemsen
+ *
+ * @brief   Restore possible alignment rules
+ *
+ * @copyright Copyright (c) Remedy IT Expertise BV
+ */
diff --git a/tao/x11/pre.h b/tao/x11/pre.h
@@ -0,0 +1,8 @@
+/**
+ * @file    pre.h
+ * @author  Johnny Willemsen
+ *
+ * @brief   Set possible alignment rules
+ *
+ * @copyright Copyright (c) Remedy IT Expertise BV
+ */
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 */