summaryrefslogtreecommitdiffstats
path: root/devel/ddd/files/patch-ddd-strclass.h
blob: c37be0ed534e516e6741c076ec3c650115ca7b69 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- ddd/strclass.h.orig	2009-02-11 17:25:06 +0000
+++ ddd/strclass.h
@@ -811,9 +811,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 +864,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;
@@ -892,6 +892,15 @@
 typedef string strTmp; // for backward compatibility
 #endif
 
+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);
+
 // Other externs
 
 int compare(const string& x,    const string& y);
OpenPOWER on IntegriCloud