Made unarchiving algorithms order N instead of order N^2.

[ginac.git] / ginac / assertion.h

diff --git a/ginac/assertion.h b/ginac/assertion.h
index 39bb4f4e37fcc0afc2709ef078d809f01c3fd6a1..bbdf74d9c8ceb9186586cb569aaf99255c634fad 100644 (file)
--- a/ginac/assertion.h
+++ b/ginac/assertion.h
@@ -3,7 +3,7 @@
  *  Assertion macro definition. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
  *
  *  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
@@ -17,18 +17,21 @@
  *
  *  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
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_ASSERTION_H__
 #define __GINAC_ASSERTION_H__
 
-#include <assert.h>
-
-#if defined(DO_GINAC_ASSERT) && !defined(ASSERT)
-#define ASSERT(X) assert(X)
+#if !defined(GINAC_ASSERT)
+#if defined(DO_GINAC_ASSERT)
+#include <cassert>
+/** Assertion macro for checking invariances. */
+#define GINAC_ASSERT(X) assert(X)
 #else
-#define ASSERT(X) ((void)0)
+/** Assertion macro for checking invariances. */
+#define GINAC_ASSERT(X) ((void)0)
+#endif
 #endif
 
 #endif // ndef __GINAC_ASSERTION_H__