From 98bf7ddc8fcf0e4df0d533d83ead145dd5c75259 Mon Sep 17 00:00:00 2001 From: Son Dinh Date: Wed, 16 Apr 2025 09:41:22 -0500 Subject: [PATCH 1/2] Enable build with static OpenDDS --- tactical-microgrid-standard/common/Handshaking.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tactical-microgrid-standard/common/Handshaking.cpp b/tactical-microgrid-standard/common/Handshaking.cpp index 36a4db5..515dca9 100644 --- a/tactical-microgrid-standard/common/Handshaking.cpp +++ b/tactical-microgrid-standard/common/Handshaking.cpp @@ -10,6 +10,10 @@ #include #include #include +#if defined (ACE_AS_STATIC_LIBS) +# include +# include +#endif Handshaking::~Handshaking() { From b06cd9965c9973de8729be38b0318eaded928650 Mon Sep 17 00:00:00 2001 From: Son Dinh Date: Thu, 17 Apr 2025 10:00:17 -0500 Subject: [PATCH 2/2] Use StaticIncludes.h --- tactical-microgrid-standard/common/Handshaking.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tactical-microgrid-standard/common/Handshaking.cpp b/tactical-microgrid-standard/common/Handshaking.cpp index 515dca9..d920fe2 100644 --- a/tactical-microgrid-standard/common/Handshaking.cpp +++ b/tactical-microgrid-standard/common/Handshaking.cpp @@ -10,10 +10,7 @@ #include #include #include -#if defined (ACE_AS_STATIC_LIBS) -# include -# include -#endif +#include Handshaking::~Handshaking() {