Move include of own header to the top. Fix dependencies

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

diff --git a/src/support/debug.cpp b/src/support/debug.cpp
index bff9bf415a993a2cda8768a869f243884de52107..6ec52a069c9587148a0f1b430d1748b0cd2e8cf3 100644 (file)
--- a/src/support/debug.cpp
+++ b/src/support/debug.cpp
@@ -12,13 +12,13 @@
 
 #include <config.h>
 
-#include "support/convert.h"
 #include "support/debug.h"
+
+#include "support/convert.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/ProgressInterface.h"
-#include "support/regex.h"
 
 #include <iostream>
 #include <iomanip>
@@ -78,7 +78,7 @@ DebugErrorItem errorTags[] = {
 
 int const numErrorTags = sizeof(errorTags)/sizeof(errorTags[0]);
 
-} // namespace anon
+} // namespace
 
 
 int Debug::levelCount()
@@ -135,7 +135,7 @@ Debug::Type Debug::value(string const & val)
                                break;
                        }
                if (st == string::npos)
-               break;
+               break;
                v.erase(0, st + 1);
        }
        return l;
@@ -201,22 +201,20 @@ 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;
 }
 
 
 // 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,7 +241,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)