* Added Clang-related flag to gui.pro

samiraguiar · danmar · commit 141a07179215 · 2015-01-20T19:20:00.000+01:00
* Updated external lib location with PWD variable
diff --git a/gui/gui.pro b/gui/gui.pro
@@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
     LIBS += -l../bin/cppcheck-core
     DEFINES += CPPCHECKLIB_IMPORT
 }
-LIBS += -L../externals
+LIBS += -L$$PWD/../externals
 
 DESTDIR = .
 RCC_DIR = temp
@@ -149,3 +149,9 @@ win32 {
 contains(QMAKE_CC, gcc) {
     QMAKE_CXXFLAGS += -std=c++0x
 }
+
+macx {
+    contains(QMAKE_CXX, clang++) {
+        QMAKE_CXXFLAGS += -std=c++11
+    }
+}
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2761,7 +2761,7 @@ void Tokenizer::setVarId()
     }
 
     // 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()) {
         if (Token::Match(tok, "namespace|class|struct %var% {|:")) {
             const std::string &classname(tok->next()->str());

Original file line number	Diff line number	Diff line change
`@@ -2761,7 +2761,7 @@ void Tokenizer::setVarId()`
`2761`	`2761`	`}`
`2762`	`2762`
`2763`	`2763`	`// class members..`
`2764`		`- std::map<std::string, std::map<std::string, unsigned int>> varlist;`
	`2764`	`+ std::map<std::string, std::map<std::string, unsigned int> > varlist;`
`2765`	`2765`	`for (Token *tok = list.front(); tok; tok = tok->next()) {`
`2766`	`2766`	`if (Token::Match(tok, "namespace\|class\|struct %var% {\|:")) {`
`2767`	`2767`	`const std::string &classname(tok->next()->str());`