Commit 1a766032 authored by Max Lyon's avatar Max Lyon

Merge branch 'VCI/warning_fixes' into QGP/warning_fixes

parents 13eb244b 3c6cb8bb
...@@ -19,9 +19,40 @@ ...@@ -19,9 +19,40 @@
#else #else
#if __cplusplus >= 201103L
#ifdef __clang__
#define LOW_CODE_QUALITY_SECTION_BEGIN \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wdeprecated-register\"") //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_BEGIN
#define LOW_CODE_QUALITY_SECTION_END #define LOW_CODE_QUALITY_SECTION_END
#endif
#endif // ifdef _MSC_VER #endif // ifdef _MSC_VER
#endif // QUALITY_HH_INCLUDED #endif // QUALITY_HH_INCLUDED
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#define BASE_DEBCONFIG_HH_INCLUDED #define BASE_DEBCONFIG_HH_INCLUDED
#ifdef DEB_ON #ifdef DEB_ON
#include <Base/Config/BaseDefines.hh>
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -13,7 +14,7 @@ namespace Debug { ...@@ -13,7 +14,7 @@ namespace Debug {
Access the global, per-process, configuration options of the Debug system. Access the global, per-process, configuration options of the Debug system.
\todo Make this a per-thread configuration. \todo Make this a per-thread configuration.
*/ */
class Config class BASEDLLEXPORT Config
{ {
public: public:
static const Config& query(); static const Config& query();
......
...@@ -120,7 +120,7 @@ template <typename ElementT> ...@@ -120,7 +120,7 @@ template <typename ElementT>
IOutputStream& operator<<(IOutputStream& _os, IOutputStream& operator<<(IOutputStream& _os,
const std::array<ElementT, 0>& /*_vec*/) const std::array<ElementT, 0>& /*_vec*/)
{ {
return _os.print(0, (ElementT*)nullptr); return _os.print(0, (ElementT*)NULL);
} }
#endif// STD_ARRAY_AVAILABLE #endif// STD_ARRAY_AVAILABLE
...@@ -247,7 +247,7 @@ inline FormatT<> format_hex(const uint32_t _vrbl) ...@@ -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) //! Format a 64bit size_t variable for streaming in hex (e.g. for hash)
template <> template <>
inline FormatT<> format_hex(const uint64_t _vrbl) inline FormatT<> format_hex(const uint64_t _vrbl)
{ {
return FormatT<>("%" PRIx64, _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