Changeset 344c8c in git

Timestamp:

Jan 15, 2007, 9:41:25 AM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

9be487a3eaa4fd744fcf9a5e32eaad3021224f23

Parents:

2381568d9d382d0ba33856958bce68cc490a19b0

Message:

*hannes: static stuff


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

Location:

kernel

Files:

• p_Procs_Impl.h (modified) (2 diffs)
• p_Procs_Set.h (modified) (5 diffs)

kernel/p_Procs_Impl.h

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Impl.h,v 1.4 2007-01-12 14:28:30 Singular Exp $
+ *  Version: $Id: p_Procs_Impl.h,v 1.5 2007-01-15 08:41:25 Singular Exp $
  *******************************************************************/
 #ifndef P_PROCS_IMPL_H
@@ -107 +107 @@
   FieldGeneral = 0,
   FieldZp,          
-#ifdef NV_OPS
-  FieldZpGeneral,
-#endif
   FieldQ,
   FieldR,

kernel/p_Procs_Set.h

@@ -12 +12 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_Procs_Set.h,v 1.9 2007-01-12 14:28:31 Singular Exp $
+ *  Version: $Id: p_Procs_Set.h,v 1.10 2007-01-15 08:41:25 Singular Exp $
  *******************************************************************/
 #include "modulop.h"
@@ -23 +23 @@
 {
   if (rField_is_Zp(r))
-#ifdef NV_OPS
-  {
-    if (r->ch<=NV_MAX_PRIME) return FieldZp;
-    else                     return FieldZpGeneral;
-  }
-#else
     return FieldZp;
-#endif
   if (rField_is_R(r)) return FieldR;
   if (rField_is_GF(r)) return FieldGF;
@@ -126 +119 @@
 #endif
 
-#if (defined(HAVE_DL) && defined(HAVE_DYNAMIC_LOADING))
-
 #define CheckProc(which)                                    \
 do                                                          \
@@ -141 +132 @@
 while (0);
 
-#else
-// static variant
-#define CheckProc(which)                                    \
-do                                                          \
-{                                                           \
-  if (p_Procs->which == NULL)                               \
-  {                                                         \
-    p_Procs->which = (which##_Proc_Ptr)                     \
-      which##__FieldGeneral_LengthGeneral_OrdGeneral;       \
-  }                                                         \
-}                                                           \
-while (0);
-
-#endif
 // Choose a set of p_Procs
 void p_ProcsSet(ring r, p_Procs_s* p_Procs)
@@ -170 +147 @@
   SetProcs(field, length, ord);
   #ifdef NV_OPS
-  if (field==FieldZpGeneral)
+  if ((field==FieldZp) && (r->ch>NV_MAX_PRIME))
   {
     // set all (mult/div.) routines to FieldGeneral-variants