X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstrings%2Fregmatch.h;h=8d4406a483ac19b01476a3684b73a2bde7a4e094;hb=HEAD;hp=b79104bad530f9f6846791e97cda7771f9252d37;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8;p=libs%2Fcore.git

diff --git a/source/strings/regmatch.h b/source/strings/regmatch.h
index b79104b..8d4406a 100644
--- a/source/strings/regmatch.h
+++ b/source/strings/regmatch.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include <msp/core/mspcore_api.h>
 
 namespace Msp {
 
@@ -16,7 +17,7 @@ part matched by the whole regex.  Further groups, if present, indicate parts
 matched by subregexes.  These are ordered from left to right, by the opening
 parenthesis of the subregex.
 */
-class RegMatch
+class MSPCORE_API RegMatch
 {
 public:
 	/**
@@ -26,14 +27,13 @@ public:
 	{
 		typedef std::string::size_type size_type;
 
-		bool match;        //< Whether or not this group matched
-		size_type begin;   //< First offset of the match
-		size_type end;     //< One-past-last offset
-		size_type length;  //< Length of the match (end-begin)
-		std::string str;   //< The part of the string that matched
+		bool match = false;  //< Whether or not this group matched
+		size_type begin;     //< First offset of the match
+		size_type end;       //< One-past-last offset
+		size_type length;    //< Length of the match (end-begin)
+		std::string str;     //< The part of the string that matched
 
-		Group(): match(false) { }
-		operator bool() const { return match; }
+		explicit operator bool() const { return match; }
 	};
 
 private:
@@ -41,7 +41,7 @@ private:
 
 public:
 	/** Constructs a RegMatch representing a non-match. */
-	RegMatch() { }
+	RegMatch() = default;
 
 	/** Constructs a new RegMatch from a string and groups.  The length and str
 	members of each group are computed and need not be set.  Intended to be used
@@ -66,7 +66,7 @@ public:
 	/** Shorthand for the group() function. */
 	const Group &operator[](unsigned i) const { return group(i); }
 
-	operator bool() const { return !empty(); }
+	explicit operator bool() const { return !empty(); }
 };
 
 } // namespace Msp