Renamed some variables to avoid clash with #defines in Visual Studio.

1ee8b5dc · Davis King · e5aeac4b · 1ee8b5dc
Commit 1ee8b5dc authored Oct 12, 2014 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

dlib/test/statistics.cpp dlib/test/statistics.cpp +5 -5

No files found.
--- a/dlib/test/statistics.cpp
+++ b/dlib/test/statistics.cpp
@@ -697,14 +697,14 @@ namespace
            frobmetric_training_sample<matrix<double,0,1> > sample;
            std::vector<frobmetric_training_sample<matrix<double,0,1> > > samples;
-            matrix<double,3,1> x, near, far;
+            matrix<double,3,1> x, near_, far_;
            x    = 0,0,0;
-            near = 1,0,0;
+            near_ = 1,0,0;
-            far  = 0,1,0;
+            far_  = 0,1,0;
            sample.anchor_vect = x;
-            sample.near_vects.push_back(near);
+            sample.near_vects.push_back(near_);
-            sample.far_vects.push_back(far);
+            sample.far_vects.push_back(far_);
            samples.push_back(sample);