Commit ca776b5a authored by Marco Amagliani's avatar Marco Amagliani
Browse files

Merge remote-tracking branch 'origin/master' into B&I/Test-Split-Diff-Files

parents 5aa9d382 401247b8
......@@ -19,9 +19,43 @@
#else
#if __cplusplus >= 201103L
#ifdef __clang__
#define LOW_CODE_QUALITY_SECTION_BEGIN \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wdeprecated-register\"") \
_Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") \
_Pragma("clang diagnostic ignored \"-Wshift-negative-value\"")
//TODO: ignore more warnings as needed
#define LOW_CODE_QUALITY_SECTION_END \
_Pragma("clang diagnostic pop")
#elif defined(__GNUG__)
#define LOW_CODE_QUALITY_SECTION_BEGIN \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wall\"") //TODO: ignore more warnings as needed
#define LOW_CODE_QUALITY_SECTION_END \
_Pragma("GCC diagnostic pop")
#else
#define LOW_CODE_QUALITY_SECTION_BEGIN
#define LOW_CODE_QUALITY_SECTION_END
#endif
#else
#define LOW_CODE_QUALITY_SECTION_BEGIN
#define LOW_CODE_QUALITY_SECTION_END
#endif
#endif // ifdef _MSC_VER
#endif // QUALITY_HH_INCLUDED
......@@ -4,6 +4,7 @@
#define BASE_DEBCONFIG_HH_INCLUDED
#ifdef DEB_ON
#include <Base/Config/BaseDefines.hh>
#include <string>
#include <vector>
......@@ -13,7 +14,7 @@ namespace Debug {
Access the global, per-process, configuration options of the Debug system.
\todo Make this a per-thread configuration.
*/
class Config
class BASEDLLEXPORT Config
{
public:
static const Config& query();
......
......@@ -120,7 +120,7 @@ template <typename ElementT>
IOutputStream& operator<<(IOutputStream& _os,
const std::array<ElementT, 0>& /*_vec*/)
{
return _os.print(0, (ElementT*)nullptr);
return _os.print(0, (ElementT*)NULL);
}
#endif// STD_ARRAY_AVAILABLE
......@@ -247,7 +247,7 @@ inline FormatT<> format_hex(const uint32_t _vrbl)
//! Format a 64bit size_t variable for streaming in hex (e.g. for hash)
template <>
inline FormatT<> format_hex(const uint64_t _vrbl)
inline FormatT<> format_hex(const uint64_t _vrbl)
{
return FormatT<>("%" PRIx64, _vrbl);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment