[med-svn] [ball] 05/08: DEP3

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ball.

commit 2141317f9b9265ca9db268869c0e7dbe0d5ef3a3
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 7 09:01:38 2016 +0100

    DEP3
---
 debian/patches/gcc5.diff | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/patches/gcc5.diff b/debian/patches/gcc5.diff
index ef20351..d2ad78f 100644
--- a/debian/patches/gcc5.diff
+++ b/debian/patches/gcc5.diff
@@ -1,6 +1,11 @@
---- a/include/BALL/DATATYPE/string.h	2013-03-07 21:15:10.000000000 +0400
-+++ b/include/BALL/DATATYPE/string.h	2014-07-31 02:12:03.770913795 +0400
-@@ -47,6 +47,9 @@
+Author: Matthias Klose <doko at debian.org>
+Last-Update: Thu, 09 Jul 2015 12:17:06 +0200
+Bug-Debian: https://bugs.debian.org/755225
+Description: Fix some build errors with GCC 5 and clang++
+
+--- a/include/BALL/DATATYPE/string.h
++++ b/include/BALL/DATATYPE/string.h
+@@ -47,6 +47,9 @@ namespace BALL
  {
  	// forward declaration
  	class Substring;
@@ -10,7 +15,7 @@
  
  	/**	\defgroup String String
  			An improved version of STL string.
-@@ -998,7 +1001,7 @@
+@@ -998,7 +1001,7 @@ namespace BALL
  
  		///
  		BALL_EXPORT
@@ -21,7 +26,7 @@
  
 --- a/source/FORMAT/molFileFactory.C
 +++ b/source/FORMAT/molFileFactory.C
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ namespace BALL
  			try
  			{
  				string s;
@@ -41,7 +46,7 @@
  
  using namespace std;
  using namespace boost;
-@@ -1604,13 +1604,13 @@ bool BinaryFingerprintMethods::connectedComponents(const vector<unsigned int>& s
+@@ -1584,13 +1584,13 @@ bool BinaryFingerprintMethods::connected
  	{
  		
  		// STEP 1: Get connected components and member indices
@@ -58,7 +63,7 @@
  			}
  			
  // 			ccs_tmp[ds->find_set(current_vertex)][current_vertex] = ccs_tmp[ds->find_set(current_vertex)].size();
-@@ -1628,7 +1628,7 @@ bool BinaryFingerprintMethods::connectedComponents(const vector<unsigned int>& s
+@@ -1608,7 +1608,7 @@ bool BinaryFingerprintMethods::connected
  		}
  		
  		// STEP 3: Write information in return data structures

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git