From 097f0fb80de9becf14ff7d16ac79a36ee68db230 Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Sun, 28 Dec 2014 14:51:19 +0100
Subject: [PATCH] Fix paths

---
 gtsam/nonlinear/Expression-inl.h                      | 2 +-
 gtsam/nonlinear/expressionTesting.h                   | 2 +-
 gtsam/nonlinear/tests/testCallRecord.cpp              | 2 +-
 gtsam/nonlinear/tests/testExpressionFactor.cpp        | 6 +++---
 gtsam_unstable/nonlinear/tests/testExpressionMeta.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gtsam/nonlinear/Expression-inl.h b/gtsam/nonlinear/Expression-inl.h
index 190457673..0b3dea645 100644
--- a/gtsam/nonlinear/Expression-inl.h
+++ b/gtsam/nonlinear/Expression-inl.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/CallRecord.h>
+#include <gtsam/nonlinear/CallRecord.h>
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/base/Lie.h>
 
diff --git a/gtsam/nonlinear/expressionTesting.h b/gtsam/nonlinear/expressionTesting.h
index bcca51d07..ab6703f3a 100644
--- a/gtsam/nonlinear/expressionTesting.h
+++ b/gtsam/nonlinear/expressionTesting.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/ExpressionFactor.h>
+#include <gtsam/nonlinear/ExpressionFactor.h>
 #include <gtsam/nonlinear/Expression.h>
 #include <gtsam/base/Matrix.h>
 #include <gtsam/base/Testable.h>
diff --git a/gtsam/nonlinear/tests/testCallRecord.cpp b/gtsam/nonlinear/tests/testCallRecord.cpp
index 15a0cc494..483b5ffa9 100644
--- a/gtsam/nonlinear/tests/testCallRecord.cpp
+++ b/gtsam/nonlinear/tests/testCallRecord.cpp
@@ -18,7 +18,7 @@
  * @brief unit tests for CallRecord class
  */
 
-#include <gtsam_unstable/nonlinear/CallRecord.h>
+#include <gtsam/nonlinear/CallRecord.h>
 #include <gtsam/base/Matrix.h>
 #include <gtsam/base/Testable.h>
 
diff --git a/gtsam/nonlinear/tests/testExpressionFactor.cpp b/gtsam/nonlinear/tests/testExpressionFactor.cpp
index fff878738..99b8120e3 100644
--- a/gtsam/nonlinear/tests/testExpressionFactor.cpp
+++ b/gtsam/nonlinear/tests/testExpressionFactor.cpp
@@ -17,12 +17,12 @@
  * @brief unit tests for Block Automatic Differentiation
  */
 
-#include <gtsam_unstable/slam/expressions.h>
-#include <gtsam_unstable/nonlinear/ExpressionFactor.h>
-#include <gtsam_unstable/nonlinear/expressionTesting.h>
+#include <gtsam/slam/expressions.h>
 #include <gtsam/slam/GeneralSFMFactor.h>
 #include <gtsam/slam/ProjectionFactor.h>
 #include <gtsam/slam/PriorFactor.h>
+#include <gtsam/nonlinear/ExpressionFactor.h>
+#include <gtsam/nonlinear/expressionTesting.h>
 #include <gtsam/base/Testable.h>
 
 #include <CppUnitLite/TestHarness.h>
diff --git a/gtsam_unstable/nonlinear/tests/testExpressionMeta.cpp b/gtsam_unstable/nonlinear/tests/testExpressionMeta.cpp
index 45e294c3d..7c2f9d9b9 100644
--- a/gtsam_unstable/nonlinear/tests/testExpressionMeta.cpp
+++ b/gtsam_unstable/nonlinear/tests/testExpressionMeta.cpp
@@ -16,7 +16,7 @@
  * @brief Test meta-programming constructs for Expressions
  */
 
-#include <gtsam_unstable/nonlinear/ExpressionFactor.h>
+#include <gtsam/nonlinear/ExpressionFactor.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/base/Testable.h>