From e7334b89bd239b893dfd27ef277ac55d28aa54cb Mon Sep 17 00:00:00 2001
From: Alex Cunningham <alexgcunningham@gmail.com>
Date: Thu, 20 Jun 2013 17:08:30 +0000
Subject: [PATCH] Rebasing...

---
 gtsam_unstable/slam/serialization.h | 32 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/gtsam_unstable/slam/serialization.h b/gtsam_unstable/slam/serialization.h
index 491299fe1..08451fa0c 100644
--- a/gtsam_unstable/slam/serialization.h
+++ b/gtsam_unstable/slam/serialization.h
@@ -14,25 +14,25 @@
 namespace gtsam {
 
 // Serialize/Deserialize a NonlinearFactorGraph
-GTSAM_EXPORT std::string serializeGraph(const NonlinearFactorGraph& graph);
+std::string serializeGraph(const NonlinearFactorGraph& graph);
 
-GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraph(const std::string& serialized_graph);
+NonlinearFactorGraph::shared_ptr deserializeGraph(const std::string& serialized_graph);
 
-GTSAM_EXPORT std::string serializeGraphXML(const NonlinearFactorGraph& graph,
+std::string serializeGraphXML(const NonlinearFactorGraph& graph,
     const std::string& name = "graph");
 
-GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphXML(const std::string& serialized_graph,
+NonlinearFactorGraph::shared_ptr deserializeGraphXML(const std::string& serialized_graph,
     const std::string& name = "graph");
 
 
 // Serialize/Deserialize a Values
-GTSAM_EXPORT std::string serializeValues(const Values& values);
+std::string serializeValues(const Values& values);
 
-GTSAM_EXPORT Values::shared_ptr deserializeValues(const std::string& serialized_values);
+Values::shared_ptr deserializeValues(const std::string& serialized_values);
 
-GTSAM_EXPORT std::string serializeValuesXML(const Values& values, const std::string& name = "values");
+std::string serializeValuesXML(const Values& values, const std::string& name = "values");
 
-GTSAM_EXPORT Values::shared_ptr deserializeValuesXML(const std::string& serialized_values,
+Values::shared_ptr deserializeValuesXML(const std::string& serialized_values,
     const std::string& name = "values");
 
 // Serialize to/from files
@@ -40,21 +40,21 @@ GTSAM_EXPORT Values::shared_ptr deserializeValuesXML(const std::string& serializ
 // Filename arguments include path
 
 // Serialize
-GTSAM_EXPORT bool serializeGraphToFile(const NonlinearFactorGraph& graph, const std::string& fname);
-GTSAM_EXPORT bool serializeGraphToXMLFile(const NonlinearFactorGraph& graph,
+bool serializeGraphToFile(const NonlinearFactorGraph& graph, const std::string& fname);
+bool serializeGraphToXMLFile(const NonlinearFactorGraph& graph,
     const std::string& fname, const std::string& name = "graph");
 
-GTSAM_EXPORT bool serializeValuesToFile(const Values& values, const std::string& fname);
-GTSAM_EXPORT bool serializeValuesToXMLFile(const Values& values,
+bool serializeValuesToFile(const Values& values, const std::string& fname);
+bool serializeValuesToXMLFile(const Values& values,
     const std::string& fname, const std::string& name = "values");
 
 // Deserialize
-GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphFromFile(const std::string& fname);
-GTSAM_EXPORT NonlinearFactorGraph::shared_ptr deserializeGraphFromXMLFile(const std::string& fname,
+NonlinearFactorGraph::shared_ptr deserializeGraphFromFile(const std::string& fname);
+NonlinearFactorGraph::shared_ptr deserializeGraphFromXMLFile(const std::string& fname,
     const std::string& name = "graph");
 
-GTSAM_EXPORT Values::shared_ptr deserializeValuesFromFile(const std::string& fname);
-GTSAM_EXPORT Values::shared_ptr deserializeValuesFromXMLFile(const std::string& fname,
+Values::shared_ptr deserializeValuesFromFile(const std::string& fname);
+Values::shared_ptr deserializeValuesFromXMLFile(const std::string& fname,
     const std::string& name = "values");
 
 } // \namespace gtsam