Changeset b9624d6 in git for Singular/fglmgauss.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/fglmgauss.cc (modified) (5 diffs)

Singular/fglmgauss.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fglmgauss.cc,v 1.8 1998-06-03 15:25:18 obachman Exp $
+// $Id: fglmgauss.cc,v 1.9 1998-06-04 13:39:21 wichmann Exp $
 
 /****************************************
@@ -32 +32 @@
         newfac= NULL;
     }
-#ifndef HAVE_EXPLICIT_CONSTR
-    void mac_gaussElem( const fglmVector newv, const fglmVector newp, number & newpdenom, number & newfac )
+
+#ifndef HAVE_EXPLICIT_CONSTR
+  gaussElem() : v(), p(), pdenom(NULL), fac(NULL) {}
+
+  void mac_gaussElem( const fglmVector newv, const fglmVector newp, number & newpdenom, number & newfac )
     {
     v= newv;
@@ -43 +46 @@
     }
 #endif
+
     ~gaussElem() 
     {
@@ -55 +59 @@
     size= 0;
     max= dimen;
+#ifndef HAVE_EXPLICIT_CONSTR
+    elems= new gaussElem[ max+1 ];
+#else
     elems= (gaussElem *)Alloc( (max+1)*sizeof( gaussElem ) );
+#endif
     isPivot= (BOOLEAN *)Alloc( (max+1)*sizeof( BOOLEAN ) );
     for ( k= max; k > 0; k-- ) 
@@ -65 +73 @@
 {
     int k;
+
+#ifndef HAVE_EXPLICIT_CONSTR
+    delete [] elems;
+#else
     for ( k= size; k > 0; k-- ) 
         elems[k].~gaussElem();
     Free( (ADDRESS)elems, (max+1)*sizeof( gaussElem ) );
+#endif
+
     Free( (ADDRESS)isPivot, (max+1)*sizeof( BOOLEAN ) );
     Free( (ADDRESS)perm, (max+1)*sizeof( int ) );