From: Michael Andres <ma@suse.de>
Date: Mon, 10 Oct 2011 16:34:08 +0000 (+0200)
Subject: Use gcc-c++ >= 4.5
X-Git-Tag: 1.6.17~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=848cb770e55a7f9ce90f085e0837755761a51d49;p=platform%2Fupstream%2Fzypper.git

Use gcc-c++ >= 4.5
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec0370b..d334fe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
 ADD_DEFINITIONS( -DVERSION="${VERSION}" )
 
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -fstack-protector" )
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -Woverloaded-virtual -Wnon-virtual-dtor -fstack-protector -std=c++0x" )
 SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -O2 -Wall -fstack-protector" )
 
 GENERATE_PACKAGING(${PACKAGE} ${VERSION})
diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index 5ec4b1b..cd0866b 100755
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -509,7 +509,6 @@ static void show_update_messages(Zypper & zypper, const UpdateNotifications & me
 void solve_and_commit (Zypper & zypper)
 {
   bool need_another_solver_run = true;
-  bool commit_done = false;
   do
   {
     // CALL SOLVER
@@ -757,7 +756,6 @@ void solve_and_commit (Zypper & zypper)
           zypper.out().info(s.str(), Out::HIGH);
 
           ZYppCommitResult result = God->commit(get_commit_policy(zypper));
-          commit_done = true;
 
           MIL << endl << "DONE" << endl;
 
diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index 0d63bb3..c5332ea 100644
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -16,7 +16,7 @@ BuildRequires:  boost-devel >= 1.33.1
 BuildRequires:  gettext-devel >= 0.15
 BuildRequires:  readline-devel >= 5.1
 BuildRequires:  augeas-devel >= 0.5.0
-BuildRequires:  gcc-c++ >= 4.1
+BuildRequires:  gcc-c++ >= 4.5
 BuildRequires:  cmake >= 2.4.6
 Requires:       procps
 %if 0%{?suse_version}