Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
7508d9ea
Commit
7508d9ea
authored
Feb 28, 2012
by
Aleksei Kanash
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix to NO_THIRD_PARTY_WARNINGS macro.
parent
8fb0036b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
Sankore_3.1.pro
Sankore_3.1.pro
+0
-1
UBGlobals.h
src/globals/UBGlobals.h
+4
-5
No files found.
Sankore_3.1.pro
View file @
7508d9ea
...
...
@@ -35,7 +35,6 @@ QT += script
QT
+=
xmlpatterns
INCLUDEPATH
+=
src
INCLUDEPATH
+=
globals
include
(
$$
THIRD_PARTY_PATH
/
libs
.
pri
)
include
(
src
/
adaptors
/
adaptors
.
pri
)
...
...
src/globals/UBGlobals.h
View file @
7508d9ea
...
...
@@ -18,8 +18,6 @@
// just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push));
#endif //#ifdef NO_THIRD_PARTY_WARNINGS
// anyway on WIN
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else //#ifdef Q_WS_WIN
...
...
@@ -33,15 +31,16 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
#ifdef NO_THIRD_PARTY_WARNINGS
//disabling some warnings
#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else
// just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_
ENABLE WARNINGS_ENABLE
#define THIRD_PARTY_WARNINGS_
DISABLE _Pragma("GCC diagnostic push");
#endif //#ifdef NO_THIRD_PARTY_WARNINGS
#endif //#ifdef Q_WS_WIN
// anyway on any OS
#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#endif // UBGLOBALS_H
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