X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstrings%2Fregex.cpp;h=832cd85b110ac81d245af918375ddd24256727ef;hp=9167c6b8a9e6ae0f75fd52206bb96efe45a9424b;hb=31cc8f0c6e874e2417e76eda50af34fd17bcd90c;hpb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8

diff --git a/source/strings/regex.cpp b/source/strings/regex.cpp
index 9167c6b..832cd85 100644
--- a/source/strings/regex.cpp
+++ b/source/strings/regex.cpp
@@ -1,6 +1,7 @@
 #include <limits>
 #include <list>
 #include <stack>
+#include <vector>
 #include "format.h"
 #include "regex.h"
 
@@ -142,7 +143,7 @@ Regex::Code Regex::compile(const string &expr, string::const_iterator &iter, uns
 					result += atom;
 				}
 				result += ND_JUMP;
-				write_int<Offset>(-(atom.size()+jump_size), result);
+				write_int<Offset>(-static_cast<Offset>(atom.size()+jump_size), result);
 			}
 			else if(repeat_max>repeat_min)
 			{
@@ -157,7 +158,7 @@ Regex::Code Regex::compile(const string &expr, string::const_iterator &iter, uns
 	}
 	else
 	{
-		list<Code> branches;
+		vector<Code> branches;
 		for(auto i=iter;;)
 		{
 			branches.push_back(compile(expr, i, group, true));