remove typedef from

MIT-SPARK · Jul 19, 2024 · e9f639d · e9f639d
1 parent 93c1d6a
commit e9f639d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/include/spark_dsg/serialization/file_io.h b/include/spark_dsg/serialization/file_io.h
@@ -79,7 +79,7 @@ void saveDsgJson(const DynamicSceneGraph& graph,
  * @param filepath The filepath including extension to load from.
  * @return A pointer to the loaded graph or nullptr if loading failed.
  */
-DynamicSceneGraphPtr loadDsgJson(const std::string& filepath);
+std::shared_ptr<DynamicSceneGraph> loadDsgJson(const std::string& filepath);
 
 /**
  * @brief Save a DynamicSceneGraph to a file in binary serialization.
@@ -96,6 +96,6 @@ void saveDsgBinary(const DynamicSceneGraph& graph,
  * @param filepath The filepath including extension to load from.
  * @return A pointer to the loaded graph or nullptr if loading failed.
  */
-DynamicSceneGraphPtr loadDsgBinary(const std::string& filepath);
+std::shared_ptr<DynamicSceneGraph> loadDsgBinary(const std::string& filepath);
 
 }  // namespace spark_dsg::io
diff --git a/include/spark_dsg/serialization/graph_binary_serialization.h b/include/spark_dsg/serialization/graph_binary_serialization.h
@@ -34,18 +34,20 @@
  * -------------------------------------------------------------------------- */
 #pragma once
 
-#include "spark_dsg/spark_dsg_fwd.h"
 #include "spark_dsg/serialization/versioning.h"
+#include "spark_dsg/spark_dsg_fwd.h"
 
 namespace spark_dsg::io::binary {
 
 void writeGraph(const DynamicSceneGraph& graph,
                 std::vector<uint8_t>& buffer,
                 bool include_mesh = false);
 
-DynamicSceneGraphPtr readGraph(const uint8_t* const buffer, size_t length);
+std::shared_ptr<DynamicSceneGraph> readGraph(const uint8_t* const buffer,
+                                             size_t length);
 
-inline DynamicSceneGraphPtr readGraph(const std::vector<uint8_t>& buffer) {
+inline std::shared_ptr<DynamicSceneGraph> readGraph(
+    const std::vector<uint8_t>& buffer) {
   return readGraph(buffer.data(), buffer.size());
 }
 

diff --git a/include/spark_dsg/serialization/graph_json_serialization.h b/include/spark_dsg/serialization/graph_json_serialization.h
@@ -49,6 +49,6 @@ std::string writeGraph(const DynamicSceneGraph& graph, bool include_mesh = false
  * @param contents JSON string to parse
  * @returns Resulting parsed scene graph
  */
-DynamicSceneGraphPtr readGraph(const std::string& contents);
+std::shared_ptr<DynamicSceneGraph> readGraph(const std::string& contents);
 
 }  // namespace spark_dsg::io::json
diff --git a/include/spark_dsg/spark_dsg_fwd.h b/include/spark_dsg/spark_dsg_fwd.h
@@ -13,6 +13,5 @@ struct EdgeContainer;
 
 class SceneGraphLayer;
 class DynamicSceneGraph;
-using DynamicSceneGraphPtr = std::shared_ptr<DynamicSceneGraph>;
 
 }  // namespace spark_dsg
diff --git a/include/spark_dsg/zmq_interface.h b/include/spark_dsg/zmq_interface.h
@@ -60,7 +60,7 @@ class ZmqReceiver {
 
   bool recv(size_t timeout_ms, bool recv_all = false);
 
-  DynamicSceneGraphPtr graph() const;
+  std::shared_ptr<DynamicSceneGraph> graph() const;
 
  private:
   struct Detail;
@@ -74,7 +74,7 @@ class ZmqGraph {
   ~ZmqGraph();
 
   bool hasChange() const;
-  DynamicSceneGraphPtr graph() const;
+  std::shared_ptr<DynamicSceneGraph> graph() const;
 
  private:
   struct Detail;

diff --git a/src/serialization/file_io.cpp b/src/serialization/file_io.cpp
@@ -95,7 +95,7 @@ void saveDsgBinary(const DynamicSceneGraph& graph,
   out.write(reinterpret_cast<const char*>(graph_buffer.data()), graph_buffer.size());
 }
 
-DynamicSceneGraphPtr loadDsgBinary(const std::string& filepath) {
+std::shared_ptr<DynamicSceneGraph> loadDsgBinary(const std::string& filepath) {
   // Read the file into a buffer.
   std::ifstream infile(filepath, std::ios::in | std::ios::binary);
   std::vector<uint8_t> buffer((std::istreambuf_iterator<char>(infile)),
@@ -121,7 +121,7 @@ void saveDsgJson(const DynamicSceneGraph& graph,
   outfile << json::writeGraph(graph, include_mesh);
 }
 
-DynamicSceneGraphPtr loadDsgJson(const std::string& filepath) {
+std::shared_ptr<DynamicSceneGraph> loadDsgJson(const std::string& filepath) {
   std::ifstream infile(filepath);
   std::stringstream ss;
   ss << infile.rdbuf();