[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libqapt] /: Re-enable c++11 support in the worker since the GCC ABI changes were reverted.
From:       Jonathan Thomas <echidnaman () kubuntu ! org>
Date:       2012-06-30 16:04:40
Message-ID: 20120630160440.7371DA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit ac4e8f6540fa2deeeeca39600edc6d10e10647fb by Jonathan Thomas.
Committed on 30/06/2012 at 18:03.
Pushed by jmthomas into branch 'master'.

Re-enable c++11 support in the worker since the GCC ABI changes were reverted.

M  +2    -4    CMakeLists.txt
M  +0    -8    src/CMakeLists.txt
M  +2    -2    src/worker/worker.cpp

http://commits.kde.org/libqapt/ac4e8f6540fa2deeeeca39600edc6d10e10647fb

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bf5397..e846e5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,11 +110,9 @@ MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok)
 ENDMACRO(MACRO_ENSURE_VERSION_RANGE)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-    # FIXME: temporarily only set for the libqapt target due to
-    # GCC 4.7 bug (LP: 1000508)
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 
-  include(CheckCXXCompilerFlag)
+   include(CheckCXXCompilerFlag)
 
    # visibility support
    check_cxx_compiler_flag(-fvisibility=hidden __HAVE_GCC_VISIBILITY)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 508d384..aa19d7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,14 +43,6 @@ set_target_properties(qapt PROPERTIES
     SOVERSION ${qapt_lib_SOVERSION}
     )
 
-if (CMAKE_COMPILER_IS_GNUCXX)
-    # FIXME: temporarily only set for the libqapt target due to
-    # GCC 4.7 bug (LP: 1000508)
-    get_property(QAPTCXXFLAGS TARGET qapt PROPERTY COMPILE_FLAGS)
-    set_property(TARGET qapt PROPERTY
-                 COMPILE_FLAGS "${QAPTCXXFLAGS} ${CMAKE_CXX_FLAGS} -std=c++0x")
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
 target_link_libraries(qapt
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
diff --git a/src/worker/worker.cpp b/src/worker/worker.cpp
index 4023f9b..68e7188 100644
--- a/src/worker/worker.cpp
+++ b/src/worker/worker.cpp
@@ -632,9 +632,9 @@ void QAptWorker::installDebFile(const QString &fileName)
     archList.append(QLatin1String("all"));
     std::vector<std::string> archs = APT::Configuration::getArchitectures(false);
 
-    for (int i = 0; i < archs.size(); i++)
+    for (std::string &arch : archs)
     {
-         archList.append(QString::fromStdString(archs.at(i)));
+         archList.append(QString::fromStdString(arch));
     }
 
     if (!archList.contains(debArch)) {

[prev in list] [next in list] [prev in thread] [next in thread]