Changeset 6e3652 in git

Timestamp:

May 31, 2003, 4:14:01 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d82e285e65008aa5a29289b136fa399354b28e13

Parents:

0a7dbb8959425e09957cee8d9590fdb72de581a3

Message:

*hannes HAVE_NS stuff


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

Location:

Singular

Files:

• fehelp.cc (modified) (4 diffs)
• ring.cc (modified) (2 diffs)

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
+* versin $Id: fehelp.cc,v 1.38 2003-05-31 14:13:06 Singular Exp $
 */
 
@@ -638 +639 @@
   iiname2hdl(s, &ns, &h);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  idhdl h=IDROOT->get(s,myynest);
+#else
   idhdl h=idroot->get(s,myynest);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
 
@@ -692 +697 @@
     yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+    yylplex(str, libnamebuf, &lib_style, IDROOT, FALSE, GET_INFO);
+#else
     yylplex(str, libnamebuf, &lib_style, GET_INFO);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
     reinit_yylp();
@@ -743 +752 @@
   iiname2hdl(key, &ns, &h);
 #else /* HAVE_NAMESPACES */
+#ifdef HAVE_NS
+  idhdl h=IDROOT->get(key,myynest);
+#else
   idhdl h=idroot->get(key,myynest);
+#endif /* HAVE_NS */
 #endif /* HAVE_NAMESPACES */
   if ((h!=NULL) && (IDTYP(h)==PROC_CMD))

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.203 2003-03-18 23:52:04 levandov Exp $ */
+/* $Id: ring.cc,v 1.204 2003-05-31 14:14:01 Singular Exp $ */
 
 /*
@@ -1007 +1007 @@
   while(p!=NULL)
   {
-    if ((p->currPack!=basePack)
-    && (p->currPack!=currPack))
-      h=rSimpleFindHdl(r,p->currPack->idroot,n);
+    if ((p->cPack!=basePack)
+    && (p->cPack!=currPack))
+      h=rSimpleFindHdl(r,p->cPack->idroot,n);
     if (h!=NULL)  return h;
     p=p->next;