Commit ed97b68e authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'centos_7_compatibility' of github.com:discos/discos into srt-new-minor-servos

parents 8bdc922d de3d709b

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
	              

## [Next Release] - 

## Added

    issue #806   Added supprto for the C-band receiver at the SRT

## Fixed

## Changed

	 issue #689 - The dataset provided by wether station has been enlarged by the wind direction. The correctponding RAL 'wx' command will noe provided wind direction readout, as well

Common/Libraries/IRALibrary/include/Cplusplus11Helper.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#ifndef CPLUSPLUS_HELPER_H

#define CPLUSPLUS_HELPER_H



#if (__cplusplus > 199711L )

#define C11_STRINGIFY(X) #X

#define C11_IGNORE_WARNING_PUSH _Pragma("GCC diagnostic push")

#define C11_IGNORE_WARNING_POP _Pragma("GCC diagnostic pop")

#define C11_IGNORE_WARNING(X) _Pragma(C11_STRINGIFY(GCC diagnostic ignored X))

#endif



#endif
 
 No newline at end of file

Common/Libraries/IRALibrary/include/CustomLoggerUtils.h

+7 −0
Original line number Diff line number Diff line 
#ifndef CUSTOM_LOGGER_UTILS_H

#define CUSTOM_LOGGER_UTILS_H



#include <Cplusplus11Helper.h>



C11_IGNORE_WARNING_PUSH

C11_IGNORE_WARNING("-Wdeprecated-declarations")

C11_IGNORE_WARNING("-Wmisleading-indentation")

C11_IGNORE_WARNING("-Wcatch-value=")

#include <logging.h>

C11_IGNORE_WARNING_POP

#include <ManagmentDefinitionsS.h>



#define CUSTOM_LOGGING_DATA_NAME "source"

Common/Libraries/IRALibrary/include/DBTable.h

+7 −0
Original line number Diff line number Diff line
@@ -11,8 +11,15 @@ 
/* Andrea Orlati(aorlati@ira.inaf.it) 22/06/2006      Creation                                          */

/* Andrea Orlati(aorlati@ira.inaf.it) 15/04/2010      Now the table also suppport calls from maci simple clients   */



#include <Cplusplus11Helper.h>



#include <vector>

C11_IGNORE_WARNING_PUSH

C11_IGNORE_WARNING("-Wdeprecated-declarations")

C11_IGNORE_WARNING("-Wmisleading-indentation")

C11_IGNORE_WARNING("-Wcatch-value=")

#include <baciValue.h>

C11_IGNORE_WARNING_POP

#include "IRA"

#include "DataField.h"

#include <expat.h>

Common/Libraries/IRALibrary/include/DataField.h

+7 −0
Original line number Diff line number Diff line
@@ -11,8 +11,15 @@ 
/* Andrea Orlati(aorlati@ira.inaf.it) 07/06/2006      Creation                                          */

/* Andrea Orlati(aorlati@ira.inaf.it) 26/01/2018      Rewritten in order to bypass an issue with 64bit ACS2017 */



#include <Cplusplus11Helper.h>



#include <vector>

C11_IGNORE_WARNING_PUSH

C11_IGNORE_WARNING("-Wdeprecated-declarations")

C11_IGNORE_WARNING("-Wmisleading-indentation")

C11_IGNORE_WARNING("-Wcatch-value=")

#include <baciValue.h>

C11_IGNORE_WARNING_POP

#include "Definitions.h"

#include "String.h"