update python

[enigma2.git] / lib / base / eerror.h

diff --git a/lib/base/eerror.h b/lib/base/eerror.h
index bf9139595b2b93282205def21d83167f16ba94e7..476029c724d24cb7db30fdf87ac2a791ea59afe0 100644 (file)
--- a/lib/base/eerror.h
+++ b/lib/base/eerror.h
@@ -9,12 +9,12 @@
 
 void eFatal(const char* fmt, ...);
 
 
 void eFatal(const char* fmt, ...);
 

-class eString;
-

 enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
 
 enum { lvlDebug=1, lvlWarning=2, lvlFatal=4 };
 

-extern Signal2<void, int, const eString&> logOutput;
+#ifndef SWIG
+extern Signal2<void, int, const std::string&> logOutput;

 extern int logOutputConsole;
 extern int logOutputConsole;

+#endif

 
 #ifdef ASSERT
 #undef ASSERT
 
 #ifdef ASSERT
 #undef ASSERT


@@ -24,7 +24,9 @@ extern int logOutputConsole;
     void eDebug(const char* fmt, ...);
     void eDebugNoNewLine(const char* fmt, ...);
     void eWarning(const char* fmt, ...);
     void eDebug(const char* fmt, ...);
     void eDebugNoNewLine(const char* fmt, ...);
     void eWarning(const char* fmt, ...);

+#ifndef SWIG

     #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }
     #define ASSERT(x) { if (!(x)) eFatal("%s:%d ASSERTION %s FAILED!", __FILE__, __LINE__, #x); }

+#endif

 #else
     inline void eDebug(const char* fmt, ...)
     {
 #else
     inline void eDebug(const char* fmt, ...)
     {