Bug#755226: Update patch

[Alexander]

Source: ddd
Severity: minor
Tags: patch
Followup-For: Bug #755226
User: pkg-llvm-t...@lists.alioth.debian.org
Usertags: clang-ftbfs

Hi,

Please see new patch in the attach. First version of the patch has been created 
in the wrong way.

Thanks,
Alexander


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- ./ddd/strclass.h	2009-02-11 20:25:06.000000000 +0300
+++ ../ddd-3.3.12-my/./ddd/strclass.h	2014-07-31 01:42:00.149939177 +0400
@@ -543,6 +543,10 @@
     bool OK() const; 
 };
 
+class string;
+string common_prefix(const string& x, const string& y, int startpos = 0);
+string common_suffix(const string& x, const string& y, int startpos = -1);
+int readline(std::istream& s, string& x, char terminator = '\n', int discard_terminator = 1);
 
 class string
 {
@@ -811,9 +815,9 @@
 		     const regex& sep);
 
     friend string common_prefix(const string& x, const string& y, 
-				int startpos = 0);
+				int startpos);
     friend string common_suffix(const string& x, const string& y, 
-				int startpos = -1);
+				int startpos);
     friend string replicate(char c, int n);
     friend string replicate(const string& y, int n);
     friend string join(const string *src, int n, const string& sep);
@@ -864,8 +868,8 @@
     friend std::istream& operator>>(std::istream& s, string& x);
 
     friend int readline(std::istream& s, string& x, 
-			char terminator = '\n',
-			int discard_terminator = 1);
+			char terminator,
+			int discard_terminator);
 
     // Status
     unsigned int length() const;