Commit 2747cb50 authored by Thomas Braun's avatar Thomas Braun
Browse files

tango/common/tango_const.h: Move more version constants to versions.h.in

parent 91a04083

src/client/Database.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <tango/client/DbHistory.h>

#include <tango/client/DbServerCache.h>

#include <tango/common/defines.h>

#include <tango/common/versions.h>

#include <tango/server/Logging.h>

#include <tango/server/ReaderLock.h>

#include <tango/server/seq_vec.h>

src/include/tango/common/tango_const.h

+0 −9
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <tango/common/defines.h>

#include <tango/common/idl_wrapper.h>

#include <tango/common/versions.h>

#include <tango/server/exception_reason_consts.h>



#include <string>
@@ -41,15 +40,7 @@ inline void string_free(char *s) 
// Some general interest define

//



#define TBS(s) #s

#define XTBS(s) TBS(s)



// NOLINTBEGIN(readability-identifier-naming)

const char *const TgLibVers = XTBS(TANGO_VERSION_MAJOR.TANGO_VERSION_MINOR.TANGO_VERSION_PATCH);

const char *const TgLibMajorVers = XTBS(TANGO_VERSION_MAJOR);



const int TgLibVersNb = (TANGO_VERSION_MAJOR * 10000) + (TANGO_VERSION_MINOR * 100) + TANGO_VERSION_PATCH;



const int DevVersion = 6; // IDL version number

const int DefaultMaxSeq = 20;

const int DefaultBlackBoxDepth = 50;

src/include/tango/common/versions.h.in

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ 


namespace Tango

{

#define TBS(s) #s

#define XTBS(s) TBS(s)



// NOLINTBEGIN(readability-identifier-naming)

const char *const TgLibVers = XTBS(TANGO_VERSION_MAJOR.TANGO_VERSION_MINOR.TANGO_VERSION_PATCH);

const char *const TgLibMajorVers = XTBS(TANGO_VERSION_MAJOR);



const int TgLibVersNb = (TANGO_VERSION_MAJOR * 10000) + (TANGO_VERSION_MINOR * 100) + TANGO_VERSION_PATCH;

// NOLINTEND(readability-identifier-naming)



/// @brief The git revision of the source tree used to build this library.

///

src/server/Util.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <tango/client/EventConsumerKeepAliveThread.h>

#include <tango/common/defines.h>

#include <tango/common/PointerWithLock.h>

#include <tango/common/versions.h>

#include <tango/server/DServer.h>

#include <tango/server/DServerClass.h>

#include <tango/server/DServerSignal.h>