Changeset b9624d6 in git for Singular/fglmcomb.cc

Timestamp:

Jun 4, 1998, 3:39:21 PM (26 years ago)

Author:

Tim Wichmann <wichmann@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

9bc55636ce6d395563fd45ac7d2eee0dbcaf046d

Parents:

87be9cbe919257412a7b85444fc35ac94702bf38

Message:

* wichmann: + added HAVE_EXPLICIT_CONSTR support


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

File:

• Singular/fglmcomb.cc (modified) (6 diffs)

Singular/fglmcomb.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmcomb.cc,v 1.11 1998-05-19 09:46:46 pohl Exp $
+// $Id: fglmcomb.cc,v 1.12 1998-06-04 13:38:48 wichmann Exp $
 
 /****************************************
@@ -199 +199 @@
 
     nf= (polyset)Alloc( numMonoms * sizeof( poly ) );
+
+#ifndef HAVE_EXPLICIT_CONSTR
+    mv= new fglmVector[ numMonoms ];
+#else
     mv= (fglmVector *)Alloc( numMonoms * sizeof( fglmVector ) );
-
+#endif
+
+#ifndef HAVE_EXPLICIT_CONSTR
+    v= new fglmVector[ numMonoms ];
+#else
     v= (fglmVector *)Alloc( numMonoms * sizeof( fglmVector ) );
+#endif
+
     basisMax= basisBS;
     basis= (polyset)Alloc( basisMax * sizeof( poly ) );
@@ -260 +270 @@
         }
         nf[k]= current;
-#ifdef __NO_CONSTR__
+#ifndef HAVE_EXPLICIT_CONSTR
         mv[k].mac_constr( currV );
 #else
@@ -271 +281 @@
         STICKYPROT( "." );
  
-#ifdef __NO_CONSTR__
+#ifndef HAVE_EXPLICIT_CONSTR
         v[k].mac_constr_i( basisSize );
 #else
@@ -341 +351 @@
             act++;
         }
+#ifndef HAVE_EXPLICIT_CONSTR
+        v[best-1].clearelems();
+#else
         v[best-1].~fglmVector();
+#endif
     }
     poly result = NULL;
@@ -386 +400 @@
 //     for ( k= 0; k < numMonoms; k++ )
 //         v[k].~fglmVector();
+#ifndef HAVE_EXPLICIT_CONSTR
+    delete [] v;
+#else
     Free( (ADDRESS)v, numMonoms * sizeof( fglmVector ) );
+#endif
+
     for ( k= 0; k < basisSize; k++ )
         pDelete( basis + k );
     Free( (ADDRESS)basis, basisMax * sizeof( poly ) );
+
+#ifndef HAVE_EXPLICIT_CONSTR
+    delete [] mv;
+#else
     for ( k= 0; k < numMonoms; k++ )
         mv[k].~fglmVector();
     Free( (ADDRESS)mv, numMonoms * sizeof( fglmVector ) );
+#endif
 
     for ( k= 0; k < numMonoms; k++ )