Commit eac507fb authored Dec 08, 2025 by Thomas Braun

Merge branch 'create-idl-wrapper-header' into 'main'

tango/common/idl_wrapper.h: Introduce it

Up to now one had to include tango/common/tango_const.h for getting the
warning free version of tango/idl/tango.h. As this is very unintuitive and
not error prone, let's introdude a wrapper header which everyone can
include.

This is done in the same spirit as omnithread_wrapper.h from 7bf8f11a
(Windows support for the replacement of tango/tango.h, 2025-05-06).

See merge request !1563

parents 9e36478e 969d43d5

CMakeLists.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,9 @@ if (TANGO_CHECK_HEADERS_SELF_CONTAINED)
		endfunction()
		endif()

		# multi process compilation
		add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>)

		#source code
		add_subdirectory("log4tango")
		add_subdirectory("src")

configure/cmake_win.cmake

+0 −3

Original line number	Diff line number	Diff line
		@@ -6,9 +6,6 @@ if(CMAKE_CL_64)
		add_definitions(-D_64BITS)
		endif()

		# multi process compilation
		add_compile_options(/MP)

		set(TANGO_LIBRARY_NAME tango)

		if(CMAKE_BUILD_TYPE STREQUAL "Debug")

src/client/ApiUtil.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#include <tango/client/DeviceAttribute.h>
		#include <tango/client/eventconsumer.h>
		#include <tango/server/ReaderLock.h>
		#include <tango/server/tango_config.h>
		#include <tango/server/WriterLock.h>

		#include <iomanip>

src/client/DbServerCache.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,8 +9,8 @@
		#include <tango/internal/parse.h>

		#include <tango/client/Database.h>
		#include <tango/common/idl_wrapper.h>
		#include <tango/common/tango_const.h>
		#include <tango/idl/tango.h>

		#include <omniORB4/CORBA.h>

src/client/DbServerData.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		#include <tango/client/DbDatum.h>
		#include <tango/client/DbDevInfo.h>
		#include <tango/client/DeviceProxy.h>
		#include <tango/idl/tango.h>
		#include <tango/common/idl_wrapper.h>
		#include <tango/server/Except.h>

		#include <sstream>