Rename C++ variables to avoid use of reserved identifiers

ianthomas23 · ianthomas23 · commit 1215f7887412 · 2013-09-25T20:26:16.000+01:00
diff --git a/lib/matplotlib/tri/_tri.cpp b/lib/matplotlib/tri/_tri.cpp
@@ -2177,14 +2177,14 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_)
 
 
 RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)
-    : _M(21870), _A(1291), _C(4621), _seed(seed % _M)
+    : _m(21870), _a(1291), _c(4621), _seed(seed % _m)
 {}
 
 unsigned long
 RandomNumberGenerator::operator()(unsigned long max_value)
 {
-    _seed = (_seed*_A + _C) % _M;
-    return (_seed*max_value) / _M;
+    _seed = (_seed*_a + _c) % _m;
+    return (_seed*max_value) / _m;
 }
 
 
diff --git a/lib/matplotlib/tri/_tri.h b/lib/matplotlib/tri/_tri.h
@@ -818,7 +818,7 @@ class RandomNumberGenerator
     unsigned long operator()(unsigned long max_value);
 
 private:
-    const unsigned long _M, _A, _C;
+    const unsigned long _m, _a, _c;
     unsigned long _seed;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -2177,14 +2177,14 @@ TrapezoidMapTriFinder::Trapezoid::set_upper_right(Trapezoid* upper_right_)`
`2177`	`2177`
`2178`	`2178`
`2179`	`2179`	`RandomNumberGenerator::RandomNumberGenerator(unsigned long seed)`
`2180`		`- : _M(21870), _A(1291), _C(4621), _seed(seed % _M)`
	`2180`	`+ : _m(21870), _a(1291), _c(4621), _seed(seed % _m)`
`2181`	`2181`	`{}`
`2182`	`2182`
`2183`	`2183`	`unsigned long`
`2184`	`2184`	`RandomNumberGenerator::operator()(unsigned long max_value)`
`2185`	`2185`	`{`
`2186`		`- _seed = (_seed*_A + _C) % _M;`
`2187`		`- return (_seed*max_value) / _M;`
	`2186`	`+ _seed = (_seed*_a + _c) % _m;`
	`2187`	`+ return (_seed*max_value) / _m;`
`2188`	`2188`	`}`
`2189`	`2189`
`2190`	`2190`