Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename C++ variables to avoid use of reserved identifiers #2464

Merged
merged 1 commit into from Sep 30, 2013
Merged

Rename C++ variables to avoid use of reserved identifiers #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/matplotlib/tri/_tri.cpp
View file
Open in desktop
Expand Up @@ -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;
}


Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/tri/_tri.h
View file
Open in desktop
Expand Up @@ -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;
};

Expand Down