Fixed bug where non empty CALL responses where lost with an error.

[casparcg] / common / assert.h

diff --git a/common/assert.h b/common/assert.h
index 5c06a5e03eab1a271d44e8973ddc02b12ab9503a..79dd587cf78e21ba09c6d45cd0892e51d66d526a 100644 (file)
--- a/common/assert.h
+++ b/common/assert.h
@@ -1,45 +1,49 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\r
-*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#pragma once\r
-\r
-#include "log.h"\r
-\r
-#ifdef _MSC_VER\r
-#define _CASPAR_DBG_BREAK _CrtDbgBreak()\r
-#else\r
-#define _CASPAR_DBG_BREAK\r
-#endif\r
-\r
-#define CASPAR_VERIFY_EXPR_STR(str) #str\r
-\r
-#define CASPAR_VERIFY(expr) do{if(!(expr)){ CASPAR_LOG(warning) << "Assertion Failed: " << \\r
-       CASPAR_VERIFY_EXPR_STR(expr) << " " \\r
-       << "file:" << __FILE__ << " " \\r
-       << "line:" << __LINE__ << " "; \\r
-       _CASPAR_DBG_BREAK;\\r
-       }}while(0);\r
-\r
-#ifdef _DEBUG\r
-#define CASPAR_ASSERT(expr) CASPAR_VERIFY(expr)\r
-#else\r
-#define CASPAR_ASSERT(expr)\r
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include "log.h"
+#include "except.h"
+
+#ifdef _MSC_VER
+#define _CASPAR_DBG_BREAK _CrtDbgBreak()
+#else
+#define _CASPAR_DBG_BREAK
+#endif
+
+#define CASPAR_VERIFY_EXPR_STR(str) #str
+
+#define CASPAR_VERIFY(expr) do{if(!(expr)){ CASPAR_LOG(warning) << "Assertion Failed: " << \
+       CASPAR_VERIFY_EXPR_STR(expr) << " " \
+       << "file:" << __FILE__ << " " \
+       << "line:" << __LINE__ << " "; \
+       _CASPAR_DBG_BREAK;\
+       }}while(0);
+
+#define CASPAR_ENSURE(expr) do{if(!(expr)){ CASPAR_THROW_EXCEPTION(programming_error() << msg_info(std::string("Assertion Failed: ") + CASPAR_VERIFY_EXPR_STR(expr))); \
+       }}while(0);
+
+#ifdef _DEBUG
+#define CASPAR_ASSERT(expr) CASPAR_VERIFY(expr)
+#else
+#define CASPAR_ASSERT(expr)
 #endif
\ No newline at end of file