[Pkg-owncloud-commits] [owncloud-client] 133/332: Enable C++11

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 92f07cb60f02d23505be566113eb918142159492
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 25 12:01:27 2014 +0200

    Enable C++11
    
    In order to avoid the warning
     warning: anonymous variadic macros were introduced in C99
    Due to the use of variadic macro in the qDebug macro in Qt 5.3
    
    C++11 requires a space between string literal and macro to avoid the
    ambiguity with user defined litteral
---
 cmake/modules/Warnings.cmake | 2 ++
 src/mirall/application.cpp   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/Warnings.cmake b/cmake/modules/Warnings.cmake
index 0e1b173..29a2de8 100644
--- a/cmake/modules/Warnings.cmake
+++ b/cmake/modules/Warnings.cmake
@@ -6,9 +6,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
     endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 if(CMAKE_CXX_COMPILER MATCHES "clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 endif(CMAKE_CXX_COMPILER MATCHES "clang")
 # TODO: handle msvc compilers warnings?
 
diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 30a4376..d8f5ae3 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -71,7 +71,7 @@ QString applicationTrPath()
 #elif defined(Q_OS_MAC)
     return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
 #elif defined(Q_OS_UNIX)
-    return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
+    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "/i18n/");
 #endif
 }
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git