From 141a071792150597830c7cf9b128f26e60a00bb0 Mon Sep 17 00:00:00 2001
From: Samir Aguiar <samir.aguiar90@gmail.com>
Date: Tue, 20 Jan 2015 19:20:00 +0100
Subject: [PATCH] * Added Clang-related flag to gui.pro * Updated external lib
 location with PWD variable

---
 gui/gui.pro      | 8 +++++++-
 lib/tokenize.cpp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gui/gui.pro b/gui/gui.pro
index 880b5c782..2e1805489 100644
--- 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
index 14404854b..261197c0f 100644
--- 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());