[SCM] BOINC packaging branch, master, updated. debian/7.0.65+dfsg-3-12-g3f9f08b

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 8ade13c59b73c20aded1616e653c6db12cf1cd0c
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Thu May 23 08:42:50 2013 +0200

    cppcheck cleanliness by avoiding reuse of iterator

diff --git a/debian/patches/rrsim_iterator_cppcheck.patch b/debian/patches/rrsim_iterator_cppcheck.patch
new file mode 100644
index 0000000..f8cb231
--- /dev/null
+++ b/debian/patches/rrsim_iterator_cppcheck.patch
@@ -0,0 +1,42 @@
+Index: boinc_debian/client/rrsim_test.cpp
+===================================================================
+--- boinc_debian.orig/client/rrsim_test.cpp
++++ boinc_debian/client/rrsim_test.cpp
+@@ -184,7 +184,6 @@
+     vector<RESULT*> active;
+     unsigned int i;
+     double x;
+-    vector<RESULT*>::iterator it;
+     bool rval = false;
+ 
+     if (log_flags.rr_simulation) {
+@@ -287,7 +286,9 @@
+         int last_active_size = active.size();
+         int last_proj_active_size = pbest->active.size();
+ 
+-        // remove *rpbest from active set,
++        {
++        vector<RESULT*>::iterator it;
++	// remove *rpbest from active set,
+         // and adjust CPU time left for other results
+         //
+         it = active.begin();
+@@ -301,7 +302,10 @@
+                 it++;
+             }
+         }
++	}
+ 
++	{
++        vector<RESULT*>::iterator it;
+         // remove *rpbest from its project's active set
+         //
+         it = pbest->active.begin();
+@@ -313,6 +317,7 @@
+                 it++;
+             }
+         }
++	}
+ 
+         // If project has more results, add one to active set.
+         //
diff --git a/debian/patches/series b/debian/patches/series
index d9d0992..674c5e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -64,3 +64,4 @@ disable_new_version_check.patch
 server_installs_itself.patch
 lib_cppcheck.patch
 fopen_closing.patch
+rrsim_iterator_cppcheck.patch

-- 
BOINC packaging