Changeset fc11f45 in git

Timestamp:

May 2, 2006, 2:21:07 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

de73940e6ece1d89e3c387c97621c053abb007b2

Parents:

8fe650a84b0ab31d578930ed415d47f61208c1ad

Message:

*hannes: OM_NDEBUG setting (NTLconvert.cc int_int.h int_poly.h)


git-svn-id: file:///usr/local/Singular/svn/trunk@9083 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

factory

Files:

• NTLconvert.cc (modified) (1 diff)
• int_int.h (modified) (8 diffs)
• int_poly.h (modified) (2 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.16 2006-05-02 11:35:15 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.17 2006-05-02 12:21:07 Singular Exp $ */
 #include <config.h>
+
+#ifdef HAVE_SINGULAR
+#ifndef OM_NDEBUG
+#define OM_NDEBUG
+#endif
+#endif
 
 #include "cf_gmp.h"

factory/int_int.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_int.h,v 1.11 2003-10-15 17:19:41 Singular Exp $ */
+/* $Id: int_int.h,v 1.12 2006-05-02 12:21:07 Singular Exp $ */
 
 #ifndef INCL_INT_INT_H
@@ -17 +17 @@
 #include "gmpext.h"
 
+#ifdef HAVE_SINGULAR
+#ifndef OM_NDEBUG
+#define OM_NDEBUG
+#endif
+#endif
 
 #ifdef HAVE_OMALLOC
@@ -55 +60 @@
     InternalInteger( const InternalCF& )
     {
-        ASSERT( 0, "ups there is something wrong in your code" );
+        ASSERT( 0, "ups there is something wrong in your code" );
     }
     InternalInteger( const int i );
@@ -113 +118 @@
 
     int ilog2();
-    
+
     friend class InternalRational;
 #ifdef SINGULAR
@@ -145 +150 @@
 
     if ( mpz_is_imm( &thempi ) ) {
-        InternalCF * result = int2imm( mpz_get_si( &thempi ) );
-        delete this;
-        return result;
-    } else
-        return this;
+        InternalCF * result = int2imm( mpz_get_si( &thempi ) );
+        delete this;
+        return result;
+    } else
+        return this;
 }
 
@@ -158 +163 @@
 
     if ( mpz_is_imm( &thempi ) ) {
-        InternalCF * result = int2imm( mpz_get_ui( &thempi ) );
-        delete this;
-        return result;
-    } else
-        return this;
+        InternalCF * result = int2imm( mpz_get_ui( &thempi ) );
+        delete this;
+        return result;
+    } else
+        return this;
 }
 //}}}
@@ -185 +190 @@
 {
     if ( mpz_is_imm( &aMpi ) ) {
-        InternalCF * result = int2imm( mpz_get_si( &aMpi ) );
-        mpz_clear( &aMpi );
-        return result;
-    } else
-        return new InternalInteger( aMpi );
+        InternalCF * result = int2imm( mpz_get_si( &aMpi ) );
+        mpz_clear( &aMpi );
+        return result;
+    } else
+        return new InternalInteger( aMpi );
 }
 
@@ -196 +201 @@
 {
     if ( mpz_is_imm( &aMpi ) ) {
-        InternalCF * result = int2imm( mpz_get_ui( &aMpi ) );
-        mpz_clear( &aMpi );
-        return result;
-    } else
-        return new InternalInteger( aMpi );
+        InternalCF * result = int2imm( mpz_get_ui( &aMpi ) );
+        mpz_clear( &aMpi );
+        return result;
+    } else
+        return new InternalInteger( aMpi );
 }
 //}}}

factory/int_poly.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: int_poly.h,v 1.7 2000-09-04 13:31:31 obachman Exp $ */
+/* $Id: int_poly.h,v 1.8 2006-05-02 12:21:07 Singular Exp $ */
 
 #ifndef INCL_INT_POLY_H
@@ -15 +15 @@
 #include "variable.h"
 #include "canonicalform.h"
+
+#ifdef HAVE_SINGULAR
+#ifndef OM_NDEBUG
+#define OM_NDEBUG
+#endif
+#endif
 
 #ifdef HAVE_OMALLOC