X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2Fsenfassert.hh;h=7b86d5e151d5fd42b25d1780da8f3603b8de0e4f;hb=refs%2Fheads%2Fmaster;hp=caa515a9452fde71d30663e888905cc9070510ee;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/senfassert.hh b/senf/Utils/senfassert.hh
index caa515a..7b86d5e 100644
--- a/senf/Utils/senfassert.hh
+++ b/senf/Utils/senfassert.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program 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 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief senfassert public header */
@@ -27,23 +32,60 @@
 #define HH_SENF_Utils_senfassert_ 1
 
 // Custom includes
-#include "../Utils/senfassert.hh"
+#include "IgnoreValue.hh"
 
 //#include "senfassert.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifndef SENF_DEBUG
 
-#   define SENF_ASSERT(x)
+#   define SENF_ASSERT(x, comment)
+#   define SENF_ASSERT_EXPRESSION(expression, comment) senf::IGNORE( expression )
 
 #else
 
 #   include <cassert>
-#   define SENF_ASSERT(x) assert(x)
+#   define SENF_ASSERT(x, comment) assert((x) && comment)
+#   define SENF_ASSERT_EXPRESSION(expression, comment) assert((expression) && comment)
+
+#endif
 
+
+/* Lifted direct from:
+   Modern C++ Design: Generic Programming and Design Patterns Applied Section 2.1
+   by Andrei Alexandrescu
+*/
+namespace senf {
+namespace detail {
+    template<bool> class compile_time_check
+    {
+    public:
+        compile_time_check(...) {}
+    };
+
+    template<> class compile_time_check<false>
+    {
+    };
+}}
+
+    /*
+    SENF_STATIC_ASSERT is only in operation when SENF_DEBUG is defined. It will test its first
+    argument at compile time and on failure report the error message of the second argument,
+    which must be a valid c++ classname. i.e. no spaces, punctuation or reserved keywords.
+    */
+#ifdef SENF_DEBUG
+#   define SENF_STATIC_ASSERT(expr, msg)                                    \
+    do {                                                                    \
+        struct STATIC_ASSERT_FAILED_##msg {};                               \
+        typedef senf::detail::compile_time_check< (expr) != 0 > tmplimpl;   \
+        tmplimpl aTemp = tmplimpl(STATIC_ASSERT_FAILED_##msg());            \
+        (void)sizeof(aTemp);                                                      \
+    } while (0)
+#else
+#   define SENF_STATIC_ASSERT(expr, msg)
 #endif
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "senfassert.cci"
 //#include "senfassert.ct"
 //#include "senfassert.cti"