Changeset 8d8fef in git for Singular/misc_ip.cc

Timestamp:

Jul 29, 2019, 11:36:09 PM (5 years ago)

Author:

Murray Heymann <heymann.murray@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

feed60bef09898f675e0f8605ed0ac0eaa8bed5a

Parents:

da1ec3de158a4f05384b9a83be86fc4c1942ec5fc1b9ababa50e8059dd847da0957f50aea901e6a8

Message:

Merge branch 'machine_learning' of github.com:MHeymann/Sources into machine_learning

File:

• Singular/misc_ip.cc (modified) (2 diffs)

Singular/misc_ip.cc

@@ -714 +714 @@
 
    // set global variable to show memory usage
-  int om_sing_opt_show_mem;
+  extern int om_sing_opt_show_mem;
   if (BVERBOSE(V_SHOW_MEM)) om_sing_opt_show_mem = 1;
   else om_sing_opt_show_mem = 0;
@@ -1411 +1411 @@
     //h=enterid("CC",0/*level*/, CRING_CMD,&(basePack->idroot),FALSE /*init*/,FALSE /*search*/);
     //IDDATA(h)=(char*)nInitChar(n_long_C,NULL);
+#ifdef SINGULAR_4_2
     n_coeffType t;
-#ifdef SINGULAR_4_2
     t=nRegister(n_unknown,n_AEInitChar);
     if (t!=n_unknown)