From e66cd56bf52fbcae0cda2e52b3e8e6840ee44e95 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Sun, 1 Jun 2014 13:49:19 -0400 Subject: [PATCH] Windows fixes. Made global test variables static --- gtsam/slam/tests/testLago.cpp | 10 +++++----- gtsam/slam/tests/testSmartProjectionPoseFactor.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtsam/slam/tests/testLago.cpp b/gtsam/slam/tests/testLago.cpp index 2a143e9a5..5e4b2faf2 100644 --- a/gtsam/slam/tests/testLago.cpp +++ b/gtsam/slam/tests/testLago.cpp @@ -33,7 +33,7 @@ using namespace std; using namespace gtsam; using namespace boost::assign; -Symbol x0('x', 0), x1('x', 1), x2('x', 2), x3('x', 3); +static Symbol x0('x', 0), x1('x', 1), x2('x', 2), x3('x', 3); static SharedNoiseModel model(noiseModel::Isotropic::Sigma(3, 0.1)); namespace simple { @@ -48,10 +48,10 @@ namespace simple { // x0 // -Pose2 pose0 = Pose2(0.000000, 0.000000, 0.000000); -Pose2 pose1 = Pose2(1.000000, 1.000000, 1.570796); -Pose2 pose2 = Pose2(0.000000, 2.000000, 3.141593); -Pose2 pose3 = Pose2(-1.000000, 1.000000, 4.712389); +static Pose2 pose0 = Pose2(0.000000, 0.000000, 0.000000); +static Pose2 pose1 = Pose2(1.000000, 1.000000, 1.570796); +static Pose2 pose2 = Pose2(0.000000, 2.000000, 3.141593); +static Pose2 pose3 = Pose2(-1.000000, 1.000000, 4.712389); NonlinearFactorGraph graph() { NonlinearFactorGraph g; diff --git a/gtsam/slam/tests/testSmartProjectionPoseFactor.cpp b/gtsam/slam/tests/testSmartProjectionPoseFactor.cpp index ee8db1267..29b482861 100644 --- a/gtsam/slam/tests/testSmartProjectionPoseFactor.cpp +++ b/gtsam/slam/tests/testSmartProjectionPoseFactor.cpp @@ -52,9 +52,9 @@ using symbol_shorthand::X; using symbol_shorthand::L; // tests data -Symbol x1('X', 1); -Symbol x2('X', 2); -Symbol x3('X', 3); +static Symbol x1('X', 1); +static Symbol x2('X', 2); +static Symbol x3('X', 3); static Key poseKey1(x1); static Point2 measurement1(323.0, 240.0);