Check return value of regex_match instead of looking at first match

[lyx.git] / src / support / convert.cpp

diff --git a/src/support/convert.cpp b/src/support/convert.cpp
index 6b985f50baf26042d972fa8d4ea8f70127763ea1..076c9d7d28cb78ad7d748ba40faeadf0b4dc2458 100644 (file)
--- a/src/support/convert.cpp
+++ b/src/support/convert.cpp
@@ -90,6 +90,22 @@ docstring convert<docstring>(unsigned long ul)
 }
 
 
+#ifdef LYX_USE_LONG_LONG
+template<>
+string convert<string>(unsigned long long ull)
+{
+       return lexical_cast<string>(ull);
+}
+
+
+template<>
+docstring convert<docstring>(unsigned long long ull)
+{
+       return from_ascii(lexical_cast<string>(ull));
+}
+#endif
+
+
 template<>
 string convert<string>(long l)
 {
@@ -104,6 +120,22 @@ docstring convert<docstring>(long l)
 }
 
 
+#ifdef LYX_USE_LONG_LONG
+template<>
+string convert<string>(long long ll)
+{
+       return lexical_cast<string>(ll);
+}
+
+
+template<>
+docstring convert<docstring>(long long ll)
+{
+       return from_ascii(lexical_cast<string>(ll));
+}
+#endif
+
+
 template<>
 string convert<string>(float f)
 {
@@ -122,6 +154,13 @@ string convert<string>(double d)
 }
 
 
+template<>
+docstring convert<docstring>(double d)
+{
+       return from_ascii(convert<string>(d));
+}
+
+
 template<>
 int convert<int>(string const s)
 {