X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdebug.cpp;h=3026df09f203b005af601e954e77ca3ac98b9452;hb=cc2835392294fb1e82a89b2ec3803f78c9183f18;hp=f44f7fcdd980e5d8e5fa26cdd00b1502a30f28c9;hpb=f41e423b303afc5162e7dbac781abaf802cefbea;p=lyx.git

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index f44f7fcdd9..3026df09f2 100644
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -18,7 +18,6 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/ProgressInterface.h"
-#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
@@ -31,14 +30,14 @@ namespace lyx {
 
 namespace {
 
-struct ErrorItem {
+struct DebugErrorItem {
 	Debug::Type level;
 	char const * name;
 	char const * desc;
 };
 
 
-ErrorItem errorTags[] = {
+DebugErrorItem errorTags[] = {
 	{ Debug::NONE,      "none",      N_("No debugging messages")},
 	{ Debug::INFO,      "info",      N_("General information")},
 	{ Debug::INIT,      "init",      N_("Program initialisation")},
@@ -78,7 +77,7 @@ ErrorItem errorTags[] = {
 
 int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 
-} // namespace anon
+} // namespace
 
 
 int Debug::levelCount()
@@ -202,21 +201,19 @@ char const * LyXErr::stripName(char const * n)
 {
 	string const name = n;
 	// find the last occurence of /src/ in name
-	static const regex re("[\\/]src[\\/]");
-	string::const_iterator const begin = name.begin();
-	string::const_iterator it = begin;
-	string::const_iterator const end = name.end();
-	smatch results;
-	while (regex_search(it, end, results, re)) {
-		it = results[0].second;
-	}
-	return n + std::distance(begin, it);
+	size_t pos = name.rfind("/src/");
+	if (pos == string::npos)
+		pos = name.rfind("\\src\\");
+	if (pos == string::npos)
+		return n;
+	else
+		return n + pos + 5;
 }
 
 
 // It seems not possible to instantiate operator template out of class body
 template<class T>
-LyXErr & toStream(LyXErr & l, T t)	
+LyXErr & toStream(LyXErr & l, T t)
 {
 	if (l.enabled()){
 		l.stream() << t;
@@ -243,6 +240,12 @@ LyXErr & operator<<(LyXErr & l, long t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long t)
 { return toStream(l, t); }
+#ifdef LYX_USE_LONG_LONG
+LyXErr & operator<<(LyXErr & l, long long t)
+{ return toStream(l, t); }
+LyXErr & operator<<(LyXErr & l, unsigned long long t)
+{ return toStream(l, t); }
+#endif
 LyXErr & operator<<(LyXErr & l, double t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, string const & t)