remove ambiguous operator (#527)

* remove ambiguous operator

* fix unit tests on gcc 10 and 11

* fix include ListenerStress

* fix include for DomainParticipant Test

* fix Conversions include

* fix include FindDataWriter

* fix include in FindDataReader

* fix includes for Topic

* fix includes

Author: trittsv

src/ddscxx/include/dds/core/detail/TInstanceHandleImpl.hpp

@@ -108,13 +108,6 @@ inline std::ostream& operator << (std::ostream& os, const dds::core::TInstanceHa
     return os;
 }
 
-//Overloaded operator << (workaround issues 252 and 162)
-inline std::ostream& operator << (std::ostream& os, const dds::core::TInstanceHandle<org::eclipse::cyclonedds::core::InstanceHandleDelegate> h)
-{
-     os << h.delegate();
-     return os;
-}
-
 // End of implementation
 
 #endif /* CYCLONEDDS_DDS_CORE_TINSTANCEHANDLE_IMPL_HPP_ */

src/ddscxx/tests/Condition.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include <gtest/gtest.h>
 
 #include "dds/dds.hpp"

src/ddscxx/tests/Conversions.cpp

@@ -8,6 +8,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
+
 #include <gtest/gtest.h>
 
 #include "dds/dds.hpp"

src/ddscxx/tests/DataReader.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include <gtest/gtest.h>
 
 #include "dds/dds.hpp"

src/ddscxx/tests/DataReaderManipulatorSelector.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include <gtest/gtest.h>
 
 #include "dds/dds.hpp"

src/ddscxx/tests/DataWriter.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "Space.hpp"

src/ddscxx/tests/DomainParticipant.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "dds/ddsrt/environ.h"

src/ddscxx/tests/FindDataReader.cpp

@@ -8,6 +8,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
+
 #include <iostream>
 #include <gtest/gtest.h>
 

src/ddscxx/tests/FindDataWriter.cpp

@@ -8,6 +8,8 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
+
 #include <iostream>
 #include <gtest/gtest.h>
 

src/ddscxx/tests/FindTopic.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "Space.hpp"

src/ddscxx/tests/ListenerStress.cpp

@@ -11,6 +11,8 @@
 #include <chrono>
 #include <thread>
 
+#include "Util.hpp"
+
 #include "dds/dds.hpp"
 #include "dds/ddsrt/sync.h"
 #include "dds/ddsrt/threads.h"

src/ddscxx/tests/Publisher.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "HelloWorldData.hpp"

src/ddscxx/tests/Qos.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 

src/ddscxx/tests/Query.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "Space.hpp"

src/ddscxx/tests/Regression.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/ddsrt/misc.h"
 
 DDSRT_WARNING_GNUC_OFF(maybe-uninitialized)

src/ddscxx/tests/Subscriber.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "HelloWorldData.hpp"

src/ddscxx/tests/Topic.cpp

@@ -8,6 +8,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
+#include "Util.hpp"
 #include "dds/dds.hpp"
 #include <gtest/gtest.h>
 #include "Space.hpp"

src/ddscxx/tests/Util.hpp

@@ -11,10 +11,21 @@
 #ifndef _TEST_UTIL_H
 #define _TEST_UTIL_H
 
+#include "dds/dds.hpp"
+
 #include <stdint.h>
 #include <stddef.h>
 
 /* Get unique g_topic name on each invocation. */
 char *create_unique_topic_name (const char *prefix, char *name, size_t size);
 
+/* I have no idea why gcc-10 and gcc-11 fail if this overload isn't available in the tests */
+#if defined __GNUC__ && __GNUC__ < 12
+inline std::ostream& operator << (std::ostream& os, const dds::core::TInstanceHandle<org::eclipse::cyclonedds::core::InstanceHandleDelegate> h)
+{
+  os << h.delegate();
+  return os;
+}
+#endif
+
 #endif /* _TEST_UTIL_H */