From 6e35e34ee47a6a17475df2e44c853f4569366716 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Tue, 25 Aug 2009 02:36:30 +0000
Subject: [PATCH] const return value does not make sense for anything but
 references

---
 cpp/LinearFactorGraph.cpp | 13 ++++++-------
 cpp/LinearFactorGraph.h   |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cpp/LinearFactorGraph.cpp b/cpp/LinearFactorGraph.cpp
index b8c6aa630..c4cc3d75d 100644
--- a/cpp/LinearFactorGraph.cpp
+++ b/cpp/LinearFactorGraph.cpp
@@ -165,15 +165,14 @@ void LinearFactorGraph::combine(const LinearFactorGraph &lfg){
 /** combine two factor graphs                                                */ 
 /* ************************************************************************* */
 
-const LinearFactorGraph LinearFactorGraph::combine2(const LinearFactorGraph& lfg1,
-		const LinearFactorGraph& lfg2)  {
-	// create new linear factor graph
-	LinearFactorGraph fg;
-	// set the first linear factor graph
-	fg = lfg1;
+LinearFactorGraph LinearFactorGraph::combine2(const LinearFactorGraph& lfg1,
+		const LinearFactorGraph& lfg2) {
+	// create new linear factor graph equal to the first one
+	LinearFactorGraph fg = lfg1;
 
 	// add the second factors in the graph
-	for(const_iterator factor=lfg2.factors.begin(); factor!=lfg2.factors.end(); factor++){
+	for (const_iterator factor = lfg2.factors.begin(); factor
+			!= lfg2.factors.end(); factor++) {
 		fg.push_back(*factor);
 	}
 
diff --git a/cpp/LinearFactorGraph.h b/cpp/LinearFactorGraph.h
index 48a5414d5..39ac54ee3 100644
--- a/cpp/LinearFactorGraph.h
+++ b/cpp/LinearFactorGraph.h
@@ -93,13 +93,13 @@ namespace gtsam {
     FGConfig optimize(const Ordering& ordering);
 
     /**
-     * combine two factor graphs
+     * static function that combines two factor graphs
      * @param const &lfg1 Linear factor graph
      * @param const &lfg2 Linear factor graph
      * @return a new combined factor graph
      */
-    static const LinearFactorGraph combine2(const LinearFactorGraph& lfg1,
-				     const LinearFactorGraph& lfg2 ) ;
+    static LinearFactorGraph combine2(const LinearFactorGraph& lfg1,
+				const LinearFactorGraph& lfg2);
 		
     /**
      * combine two factor graphs