Merge pull request #4123 from iguessthislldo/igtd/rm-ace-pre-post

jrw972 · web-flow · commit b7e4024cfa57 · 2023-04-19T11:27:06.000-05:00
Remove Many Uses of `ace/pre.h` and `ace/post.h`
diff --git a/dds/DCPS/Comparator_T.h b/dds/DCPS/Comparator_T.h
@@ -1,25 +1,22 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_COMPARATOR_T_H
 #define OPENDDS_DCPS_COMPARATOR_T_H
 
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/OS_NS_string.h"
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 #include "RcHandle_T.h"
 #include "RcObject.h"
 #include "RakeData.h"
 
+#include <ace/OS_NS_string.h>
+
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace OpenDDS {
diff --git a/dds/DCPS/DataCollector_T.h b/dds/DCPS/DataCollector_T.h
@@ -1,20 +1,15 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_DATACOLLECTOR_T_H
 #define OPENDDS_DCPS_DATACOLLECTOR_T_H
 
-// Needed here to avoid the pragma below when necessary.
-#include /**/ "ace/pre.h"
-#include /**/ "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 #include "PoolAllocator.h"
 #include "SafetyProfileStreams.h"
@@ -126,6 +121,4 @@ OPENDDS_END_VERSIONED_NAMESPACE_DECL
 #pragma implementation ("DataCollector_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#include /**/ "ace/post.h"
-
 #endif /* DATA_COLLECTOR_H */
diff --git a/dds/DCPS/GroupRakeData.h b/dds/DCPS/GroupRakeData.h
@@ -1,26 +1,23 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_GROUPRAKEDATA_H
 #define OPENDDS_DCPS_GROUPRAKEDATA_H
 
-#include /**/ "ace/pre.h"
-#include "dcps_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
-#include "dds/DdsDcpsSubscriptionC.h"
-#include "dds/DdsDcpsInfrastructureC.h"
 #include "RakeData.h"
 #include "Comparator_T.h"
-
 #include "PoolAllocator.h"
+#include "dcps_export.h"
+
+#include <dds/DdsDcpsSubscriptionC.h>
+#include <dds/DdsDcpsInfrastructureC.h>
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dds/DCPS/RakeData.h b/dds/DCPS/RakeData.h
@@ -1,21 +1,18 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_RAKEDATA_H
 #define OPENDDS_DCPS_RAKEDATA_H
 
-#include /**/ "ace/pre.h"
-#include "dcps_export.h"
 #include "ReceivedDataElementList.h"
 #include "SubscriptionInstance.h"
+#include "dcps_export.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/dds/DCPS/RakeResults_T.h b/dds/DCPS/RakeResults_T.h
@@ -1,25 +1,23 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_RAKERESULTS_T_H
 #define OPENDDS_DCPS_RAKERESULTS_T_H
 
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
-#include "dds/DdsDcpsSubscriptionC.h"
 #include "Comparator_T.h"
 #include "PoolAllocator.h"
 #include "RakeData.h"
 #include "TypeSupportImpl.h"
 
+#include <dds/DdsDcpsSubscriptionC.h>
+
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace OpenDDS {
@@ -126,6 +124,4 @@ OPENDDS_END_VERSIONED_NAMESPACE_DECL
 #include "RakeResults_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#include /**/ "ace/post.h"
-
 #endif /* RAKERESULTS_H  */
diff --git a/dds/DCPS/ZeroCopyAllocator_T.h b/dds/DCPS/ZeroCopyAllocator_T.h
@@ -1,22 +1,19 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_ZEROCOPYALLOCATOR_T_H
 #define OPENDDS_DCPS_ZEROCOPYALLOCATOR_T_H
 
-#include /**/ "ace/pre.h"
-#include "ace/Malloc_Base.h"          /* Need ACE_Allocator */
-// not needed export for templates #include "dcps_export.h"
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <dds/Versioned_Namespace.h>
 
-#include "dds/Versioned_Namespace.h"
+#include <ace/Malloc_Base.h> /* Need ACE_Allocator */
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -83,6 +80,4 @@ OPENDDS_END_VERSIONED_NAMESPACE_DECL
 #pragma implementation ("ZeroCopyAllocator_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#include /**/ "ace/post.h"
-
 #endif /* ZEROCOPYALLOCATOR_H  */
diff --git a/dds/DCPS/ZeroCopySeq_T.h b/dds/DCPS/ZeroCopySeq_T.h
@@ -1,21 +1,19 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_ZEROCOPYSEQ_T_H
 #define OPENDDS_DCPS_ZEROCOPYSEQ_T_H
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/pre.h"
+#include <ace/config-macros.h>
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 #include "ZeroCopySeqBase.h"
 #include "ZeroCopyAllocator_T.h"
+
 #include <ace/Vector_T.h>
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -233,6 +231,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #pragma implementation ("ZeroCopySeq_T.cpp")
 #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
 
-#include /**/ "ace/post.h"
-
 #endif /* ZEROCOPYSEQ_H  */
diff --git a/dds/DCPS/transport/framework/DataLinkCleanupTask.h b/dds/DCPS/transport/framework/DataLinkCleanupTask.h
@@ -1,22 +1,18 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_TRANSPORT_FRAMEWORK_DATALINKCLEANUPTASK_H
 #define OPENDDS_DCPS_TRANSPORT_FRAMEWORK_DATALINKCLEANUPTASK_H
 
-#include /**/ "ace/pre.h"
-
 #include "QueueTaskBase_T.h"
 #include "DataLink.h"
 #include "DataLink_rch.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -46,6 +42,4 @@ class OpenDDS_Dcps_Export DataLinkCleanupTask : public QueueTaskBase <DataLink_r
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
-#include /**/ "ace/post.h"
-
 #endif /* OPENDDS_DCPS_DATALINKCLEANUP_H */
diff --git a/dds/DCPS/transport/tcp/Tcp.h b/dds/DCPS/transport/tcp/Tcp.h
@@ -1,23 +1,21 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_TRANSPORT_TCP_TCP_H
 #define OPENDDS_DCPS_TRANSPORT_TCP_TCP_H
 
-#include /**/ "ace/pre.h"
-
 #include "Tcp_export.h"
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-#include "dds/Versioned_Namespace.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <dds/Versioned_Namespace.h>
+
+#include <ace/Service_Object.h>
+#include <ace/Service_Config.h>
+
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -37,6 +35,4 @@ static Tcp_Initializer tcp_initializer;
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
-#include /**/ "ace/post.h"
-
 #endif /* OPENDDS_TCP_H */
diff --git a/dds/DCPS/transport/tcp/TcpLoader.h b/dds/DCPS/transport/tcp/TcpLoader.h
@@ -1,24 +1,21 @@
 /*
- *
- *
  * Distributed under the OpenDDS License.
  * See: http://www.opendds.org/license.html
  */
 
 #ifndef OPENDDS_DCPS_TRANSPORT_TCP_TCPLOADER_H
 #define OPENDDS_DCPS_TRANSPORT_TCP_TCPLOADER_H
-#include /**/ "ace/pre.h"
 
 #include "Tcp_export.h"
 
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
+#include <dds/Versioned_Namespace.h>
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#include <ace/Service_Object.h>
+#include <ace/Service_Config.h>
 
-#include "dds/Versioned_Namespace.h"
+#ifndef ACE_LACKS_PRAGMA_ONCE
+#  pragma once
+#endif
 
 OPENDDS_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -44,5 +41,4 @@ ACE_FACTORY_DECLARE(OpenDDS_Tcp, TcpLoader)
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
-#include /**/ "ace/post.h"
 #endif /* TCP_LOADER_H */
diff --git a/performance-tests/DCPS/Priority/Options.h b/performance-tests/DCPS/Priority/Options.h
@@ -4,7 +4,6 @@
 #define OPTIONS_H
 
 // Needed here to avoid the pragma below when necessary.
-#include /**/ "ace/pre.h"
 #include /**/ "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/tests/DCPS/Priority/Options.h b/tests/DCPS/Priority/Options.h
@@ -4,7 +4,6 @@
 #define OPTIONS_H
 
 // Needed here to avoid the pragma below when necessary.
-#include /**/ "ace/pre.h"
 #include /**/ "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/tools/modeling/codegen/model/Config.h b/tools/modeling/codegen/model/Config.h
@@ -169,6 +169,7 @@ class OpenDDS_Model_Export Config  {
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
+#include /**/ "ace/post.h"
 
 #if defined (__ACE_INLINE__)
 # include "Config.inl"
diff --git a/tools/modeling/codegen/model/Entities.h b/tools/modeling/codegen/model/Entities.h
@@ -171,6 +171,8 @@ class OpenDDS_Model_Export Entities  {
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
+#include /**/ "ace/post.h"
+
 #if defined (__ACE_INLINE__)
 # include "Entities.inl"
 #endif  /* __ACE_INLINE__ */
diff --git a/tools/modeling/codegen/model/TransportDirectives.h b/tools/modeling/codegen/model/TransportDirectives.h
@@ -42,5 +42,7 @@ namespace OpenDDS { namespace Model { namespace Transport {
 
 OPENDDS_END_VERSIONED_NAMESPACE_DECL
 
+#include /**/ "ace/post.h"
+
 #endif
 
diff --git a/tools/monitor/Options.h b/tools/monitor/Options.h
@@ -11,7 +11,6 @@
 #define OPTIONS_H
 
 // Needed here to avoid the pragma below when necessary.
-#include /**/ "ace/pre.h"
 #include /**/ "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/tools/scripts/lint.pl b/tools/scripts/lint.pl
