Changeset f67df3 in git

Timestamp:

Apr 21, 2006, 6:59:47 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

ff89aa844cb04cbe6032cb5a00457f30b8b286ab

Parents:

6b503cf35c050c03092ac141a3f9b454cd8c8bc9

Message:

*hannes: 64bit fixes


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

File:

• factory/cf_random.cc (modified) (2 diffs)

factory/cf_random.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_random.cc,v 1.7 2005-08-22 17:24:01 Singular Exp $ */
+/* $Id: cf_random.cc,v 1.8 2006-04-21 16:59:47 Singular Exp $ */
 
 #include <config.h>
@@ -16 +16 @@
 class RandomGenerator {
 private:
-    const long int ia, im, iq, ir, deflt;
-    long s;
+    const int ia, im, iq, ir, deflt;
+    int s;
 
     // s must not equal zero!
-    void seedInit( long ss ) { s = ((ss == 0) ? deflt : ss); }
+    void seedInit( int ss ) { s = ((ss == 0) ? deflt : ss); }
 public:
     RandomGenerator();
-    RandomGenerator( long ss );
+    RandomGenerator( int ss );
     ~RandomGenerator() {}
-    long generate();
-    void seed( long ss ) { seedInit( ss ); }
+    int generate();
+    void seed( int ss ) { seedInit( ss ); }
 };
 
 RandomGenerator::RandomGenerator() : ia(16807), im(2147483647), iq(127773), ir(2836), deflt(123459876)
 {
-  seedInit( (long)time( 0 ) );
+  seedInit( (int)time( 0 ) );
 }
 
-RandomGenerator::RandomGenerator( long ss ) : ia(16807), im(2147483647), iq(127773), ir(2836), deflt(123459876)
+RandomGenerator::RandomGenerator( int ss ) : ia(16807), im(2147483647), iq(127773), ir(2836), deflt(123459876)
 {
   seedInit( ss );
 }
 
-long
+int
 RandomGenerator::generate()
 {
-    long k;
+    int k;
 
     k = s/iq;