some includes restored, mir_full.sln updated, some renaming of folders and projects

git-svn-id: http://svn.miranda-ng.org/main/trunk@140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 39 insertions, 0 deletions

diff --git a/plugins/JSON/Source/JSONDebug.cpp b/plugins/JSON/Source/JSONDebug.cpp
new file mode 100644
index 0000000000..3061fff616
--- /dev/null
+++ b/plugins/JSON/Source/JSONDebug.cpp
@@ -0,0 +1,39 @@
+#include "JSONDebug.h"
+#ifdef JSON_DEBUG
+
+#ifdef JSON_STDERROR
+    #include <iostream>  //need std::cerr
+#else
+    //otherwise, use a callback to tell the end user what happened
+    json_error_callback_t ErrorCallback = 0;
+    void JSONDebug::register_callback(json_error_callback_t callback){
+	   ErrorCallback = callback;
+    }
+#endif
+
+//Something went wrong or an assert failed
+void JSONDebug::_JSON_FAIL(const json_string & msg){
+    #ifdef JSON_STDERROR  //no callback, just use stderror
+	   #ifndef JSON_UNICODE
+		  std::cerr << msg << std::endl;
+	   #else
+		  std::cerr << std::string(msg.begin(), msg.end()) << std::endl;
+	   #endif
+    #else
+	   if (ErrorCallback){  //only do anything if the callback is registered
+		  #ifdef JSON_LIBRARY
+			 ErrorCallback(msg.c_str());
+		  #else
+			 ErrorCallback(msg);
+		  #endif
+	   }
+    #endif
+}
+
+//asserts that condition is true, more useful than cassert because it lets you keep going
+void JSONDebug::_JSON_ASSERT(bool condition, const json_string & msg){
+    if (!condition){
+	   _JSON_FAIL(msg);
+    }
+}
+#endif