From 9bcee033fc8982728cc70b7a4ec30f8053c39dff Mon Sep 17 00:00:00 2001
From: Can Erdogan <canerdogan.89@gmail.com>
Date: Wed, 29 Feb 2012 13:05:54 +0000
Subject: [PATCH] 1- Changed LieScalar class so it is derived from
 "DerivedValues". 2- Added an include guard to Values-inl.h.

---
 gtsam/base/LieScalar.h       | 3 ++-
 gtsam/nonlinear/Values-inl.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gtsam/base/LieScalar.h b/gtsam/base/LieScalar.h
index 51439c6f1..505f06921 100644
--- a/gtsam/base/LieScalar.h
+++ b/gtsam/base/LieScalar.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <gtsam/base/DerivedValue.h>
 #include <gtsam/base/Lie.h>
 
 namespace gtsam {
@@ -24,7 +25,7 @@ namespace gtsam {
 	/**
 	 * LieScalar is a wrapper around double to allow it to be a Lie type
 	 */
-	struct LieScalar {
+	struct LieScalar : public DerivedValue<LieScalar> {
 
 		/** default constructor */
 		LieScalar() : d_(0.0) {}
diff --git a/gtsam/nonlinear/Values-inl.h b/gtsam/nonlinear/Values-inl.h
index dd5b29fbd..8422ab1f6 100644
--- a/gtsam/nonlinear/Values-inl.h
+++ b/gtsam/nonlinear/Values-inl.h
@@ -22,6 +22,8 @@
  *  which is also a manifold element, and hence supports operations dim, retract, and localCoordinates.
  */
 
+#pragma once
+
 #include <utility>
 #include <boost/type_traits/conditional.hpp>
 #include <boost/type_traits/is_base_of.hpp>