walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

* Added Clang-related flag to gui.pro 

* Updated external lib location with PWD variable
This commit is contained in:
Samir Aguiar 2015-01-20 19:20:00 +01:00 committed by Daniel Marjamäki
parent ec21134817
commit 141a071792
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui/gui.pro
View File

@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
LIBS += -l../bin/cppcheck-core LIBS += -l../bin/cppcheck-core
DEFINES += CPPCHECKLIB_IMPORT DEFINES += CPPCHECKLIB_IMPORT
} }
LIBS += -L../externals LIBS += -L$$PWD/../externals
DESTDIR = . DESTDIR = .
RCC_DIR = temp RCC_DIR = temp
@ -149,3 +149,9 @@ win32 {
contains(QMAKE_CC, gcc) { contains(QMAKE_CC, gcc) {
QMAKE_CXXFLAGS += -std=c++0x QMAKE_CXXFLAGS += -std=c++0x
} }
macx {
contains(QMAKE_CXX, clang++) {
QMAKE_CXXFLAGS += -std=c++11
}
}

2
lib/tokenize.cpp
View File

@ -2761,7 +2761,7 @@ void Tokenizer::setVarId()
} }
// class members.. // class members..
std::map<std::string, std::map<std::string, unsigned int>> varlist; std::map<std::string, std::map<std::string, unsigned int> > varlist;
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
if (Token::Match(tok, "namespace|class|struct %var% {|:")) { if (Token::Match(tok, "namespace|class|struct %var% {|:")) {
const std::string &classname(tok->next()->str()); const std::string &classname(tok->next()->str());