Changeset 3fe8ed4 in git for factory

Timestamp:

Oct 27, 2008, 11:16:09 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3425c28defd1e45c8aacb598a943c2dfd616390f

Parents:

ad83e4fe7101dbe0763a36ab0bf774daa8c9e7db

Message:

*grayson: avoid compiler warnings about shadowing a global symbol


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

Location:

factory

Files:

• cf_eval.h (modified) (2 diffs)
• cf_reval.h (modified) (2 diffs)

factory/cf_eval.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_eval.h,v 1.5 2006-05-15 09:03:04 Singular Exp $ */
+/* $Id: cf_eval.h,v 1.6 2008-10-27 10:16:09 Singular Exp $ */
 
 #ifndef INCL_CF_EVAL_H
@@ -27 +27 @@
 public:
     Evaluation() : values() {}
-    Evaluation( int min, int max ) : values( min, max ) {}
+    Evaluation( int min0, int max0 ) : values( min0, max0 ) {}
     Evaluation( const Evaluation & e ) : values( e.values ) {}
     virtual ~Evaluation() {}

factory/cf_reval.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_reval.h,v 1.6 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: cf_reval.h,v 1.7 2008-10-27 10:16:09 Singular Exp $ */
 
 #ifndef INCL_CF_REVAL_H
@@ -19 +19 @@
 public:
     REvaluation() : Evaluation(), gen(0) {}
-    REvaluation( int min, int max, const CFRandom & sample ) : Evaluation( min, max ), gen( sample.clone() ) {}
+    REvaluation( int min0, int max0, const CFRandom & sample ) : Evaluation( min0, max0 ), gen( sample.clone() ) {}
     REvaluation( const REvaluation & e );
     ~REvaluation();