From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Sun, 7 Sep 2008 16:53:03 +0000 (+0000)
Subject: - Be more explicit in Str/SubStr and drop unused constructor.
X-Git-Tag: 0.13.6~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb96c86276d26a0954f204c5f18058bd296cef84;p=re2c

- Be more explicit in Str/SubStr and drop unused constructor.
- Fixed #2088583 Compile problemon AIX.
---

diff --git a/re2c/CHANGELOG b/re2c/CHANGELOG
index 301c8af3..f4011dad 100644
--- a/re2c/CHANGELOG
+++ b/re2c/CHANGELOG
@@ -1,5 +1,6 @@
 Version 0.13.6 (2008-??-??)
 ---------------------------
+- Fixed #2088583 Compile problemon AIX.
 
 Version 0.13.5 (2008-05-25)
 ---------------------------
diff --git a/re2c/htdocs/index.html b/re2c/htdocs/index.html
index 28b7e557..109c93fc 100755
--- a/re2c/htdocs/index.html
+++ b/re2c/htdocs/index.html
@@ -81,6 +81,10 @@ fixes which were incorporated. <a href=
 </ul>
 <hr />
 <h1>Changelog</h1>
+<h2>2008-??-??: 0.13.6</h2>
+<ul>
+<li>Fixed #2088583 Compile problemon AIX.</li>
+</ul>
 <h2>2008-05-25: 0.13.5</h2>
 <ul>
 <li>Fixed #1952896 Segfault in re2c::Scanner::scan.</li>
diff --git a/re2c/substr.cc b/re2c/substr.cc
index 1b6f5d7b..9ac32bd5 100644
--- a/re2c/substr.cc
+++ b/re2c/substr.cc
@@ -36,13 +36,6 @@ Str::Str(const SubStr& s)
 	;
 }
 
-Str::Str(Str& s)
-	: SubStr(s.str, s.len)
-{
-	s.str = NULL;
-	s.len = 0;
-}
-
 Str::Str(const char *s)
 	: SubStr(strdup(s), strlen(s))
 {
diff --git a/re2c/substr.h b/re2c/substr.h
index e6523180..32e48c3d 100644
--- a/re2c/substr.h
+++ b/re2c/substr.h
@@ -20,7 +20,7 @@ public:
 	friend bool operator==(const SubStr &, const SubStr &);
 	SubStr(const uchar*, uint);
 	SubStr(const char*, uint);
-	SubStr(const char*);
+	explicit SubStr(const char*);
 	SubStr(const SubStr&);
 	virtual ~SubStr();
 	void out(std::ostream&) const;
@@ -36,11 +36,10 @@ protected:
 class Str: public SubStr
 {
 public:
+	explicit Str(const char*);
 	Str(const SubStr&);
-	Str(Str&);
-	Str(const char*);
 	Str();
-	~Str();
+	virtual ~Str();
 };
 
 inline std::ostream& operator<<(std::ostream& o, const SubStr &s)