Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CoMISo
Base
Commits
1a766032
Commit
1a766032
authored
Dec 09, 2016
by
Max Lyon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'VCI/warning_fixes' into QGP/warning_fixes
parents
13eb244b
3c6cb8bb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
3 deletions
+35
-3
Code/Quality.hh
Code/Quality.hh
+31
-0
Debug/DebConfig.hh
Debug/DebConfig.hh
+2
-1
Utils/IOutputStream.hh
Utils/IOutputStream.hh
+2
-2
No files found.
Code/Quality.hh
View file @
1a766032
...
...
@@ -19,9 +19,40 @@
#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_END
#endif
#endif // ifdef _MSC_VER
#endif // QUALITY_HH_INCLUDED
Debug/DebConfig.hh
View file @
1a766032
...
...
@@ -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
();
...
...
Utils/IOutputStream.hh
View file @
1a766032
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment