Changeset dccd6d in git for factory/algext.cc

Timestamp:

May 7, 2012, 5:39:41 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5c0bf0e51f96eb0ce4f2b693d76e67b7ab513d4eedd81896e7de840500b43eca5d7771d36a211f79

Parents:

e7676af1109530ff2efd9495bfdb0fa2cedc576a517530b37f04ee705b7b271243a265748c447cf5

Message:

Merge pull request #101 from mmklee/factory_without_ntl

fix: issues with building factory without NTL

File:

• factory/algext.cc (modified) (3 diffs)

factory/algext.cc

@@ -13 +13 @@
 #endif
 #endif
+
+#include "cf_assert.h"
 
 #include "templates/ftmpl_functions.h"
@@ -589 +591 @@
 }
 
-#ifdef HAVE_NTL
 static CanonicalForm
 myicontent ( const CanonicalForm & f, const CanonicalForm & c )
 {
+#ifdef HAVE_NTL
     if (f.isOne() || c.isOne())
       return 1;
@@ -620 +622 @@
         return g;
     }
-}
+#else
+    return 1;
 #endif
+}
 
 CanonicalForm