diff --git a/interface/bril/shared/include/interface/bril/shared/CommonDataFormat.h b/interface/bril/shared/include/interface/bril/shared/CommonDataFormat.h index 7651786cc588a98621f49968ac865cb201fbc5ce..f6ae7081313b37c959438a810623b717dc8bf661 100644 --- a/interface/bril/shared/include/interface/bril/shared/CommonDataFormat.h +++ b/interface/bril/shared/include/interface/bril/shared/CommonDataFormat.h @@ -33,7 +33,7 @@ struct LookupItem{unsigned int id; std::string name;}; #define DEFINE_LOOKUPTABLE(Xnsname,ENUM_DEF) namespace Xnsname{ \ enum{ENUM_DEF(ENUM_VALUE)}; \ -static const LookupItem lookuptable[MAX_NUM_LOOKUPITEMS]={ENUM_DEF(LOOKUP_PAIR) {INVALID_ITEMID,INVALID_ITEMNAME} };} +static const interface::bril::shared::LookupItem lookuptable[interface::bril::shared::MAX_NUM_LOOKUPITEMS]={ENUM_DEF(LOOKUP_PAIR) {interface::bril::shared::INVALID_ITEMID,interface::bril::shared::INVALID_ITEMNAME} };} /** @@ -132,8 +132,8 @@ DEFINE_LOOKUPTABLE(StorageType,StorageType_ENUM) #define DEF_TOPICNAME(x) template<> inline std::string interface::bril::shared::Datum<x>::topicname(){ return STRINGIZE(x); } #define DEF_PAYLOADDICT(x,pd) template<> inline std::string interface::bril::shared::Datum<x>::payloaddict(){ return pd; } #define DEF_N(x,z) template<> inline size_t interface::bril::shared::Datum<x>::n(){ return z; } -#define DEF_SIMPLE_MAXSIZE(x,y,z) template<> inline size_t Datum<x>::maxsize(){ return sizeof(y)*(z)+sizeof(DatumHead); } -#define DEF_COMPOUND_MAXSIZE(x,y) template<> inline size_t Datum<x>::maxsize(){ interface::bril::shared::CompoundDataStreamer c(y); return c.datasize()+sizeof(DatumHead); } +#define DEF_SIMPLE_MAXSIZE(x,y,z) template<> inline size_t interface::bril::shared::Datum<x>::maxsize(){ return sizeof(y)*(z)+sizeof(DatumHead); } +#define DEF_COMPOUND_MAXSIZE(x,y) template<> inline size_t interface::bril::shared::Datum<x>::maxsize(){ interface::bril::shared::CompoundDataStreamer c(y); return c.datasize()+sizeof(DatumHead); } #define DEF_ALGOS(x,a) template<> inline const interface::bril::shared::LookupItem* interface::bril::shared::Datum<x>::algo_lookuptable(){return a;} #define DEF_DESCRIPTION(x,d) template<> inline std::string interface::bril::shared::Datum<x>::description(){ return d; } #define DEF_UNIT(x,u) template<> inline std::string interface::bril::shared::Datum<x>::unit(){ return u; } diff --git a/interface/bril/shared/include/interface/bril/shared/version.h b/interface/bril/shared/include/interface/bril/shared/version.h index 2f76283ff06fb04411d57644213c0c3ca48f1144..bdf92b7a0c678a6312fef38bd52831069a28cc98 100644 --- a/interface/bril/shared/include/interface/bril/shared/version.h +++ b/interface/bril/shared/include/interface/bril/shared/version.h @@ -4,7 +4,7 @@ // !!! Edit this line to reflect the latest package version !!! // version definition moved to DataFormat.h to synchronize rpm and dataversion numbers #define BRIL_INTERFACEBRILSHARED_VERSION_MAJOR 3 -#define BRIL_INTERFACEBRILSHARED_VERSION_MINOR 1 +#define BRIL_INTERFACEBRILSHARED_VERSION_MINOR 2 #define BRIL_INTERFACEBRILSHARED_VERSION_PATCH 0 // If any previous versions available E.g. #define INTERFACEBRIL_PREVIOUS_VERSIONS "3.8.0,3.8.1"