Maintain plain layout for separating paragraphs when switching layouts (#11936)

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index 6e5e7abaaf02e0a39942afbbff5f6444b52deca1..8bcd2e8103503d12a5996ce3d9fd4bcac23e5bab 100644 (file)
--- 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>
@@ -78,7 +77,7 @@ DebugErrorItem errorTags[] = {
 
 int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 
-} // namespace anon
+} // namespace
 
 
 int Debug::levelCount()
@@ -201,16 +200,14 @@ void LyXErr::endl()
 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);
+       // find the last occurrence of /src/ in name
+       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;
 }
 
 
@@ -243,7 +240,7 @@ 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
+#ifdef HAVE_LONG_LONG_INT
 LyXErr & operator<<(LyXErr & l, long long t)
 { return toStream(l, t); }
 LyXErr & operator<<(LyXErr & l, unsigned long long t)