libfive · Nekto89 · Apr 3, 2024 · Apr 10, 2024
diff --git a/libfive/include/libfive/oracle/oracle_clause.hpp b/libfive/include/libfive/oracle/oracle_clause.hpp
@@ -1,6 +1,6 @@
 /*
 libfive: a CAD kernel for modeling with implicit functions
-Copyright (C) 2017  Matt Keeter
+Copyright (C) 2017-2024 Matt Keeter
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -70,6 +70,15 @@ class OracleClause
         installed()[name] = { ser, de };
     }
 
+    /*
+     * Uninstalls a particular class's serializer / deserializer pair.
+     * Must be called with the class's name().
+     */
+    static void uninstall(const std::string& name)
+    {
+      installed().erase(name);
+    }
+
     /*
      *  Serializes an oracle clause by looking up an installed serializer.
      *      data is pushed back into the data vector
@@ -126,11 +135,7 @@ class OracleClause
      *  order dependencies.
      *  https://isocpp.org/wiki/faq/ctors#construct-on-first-use-v2
      */
-    static std::map<std::string, SerDe>& installed()
-    {
-        static std::map<std::string, SerDe> m;
-        return m;
-    }
+    static std::map<std::string, SerDe>& installed();
 };
 
 }   // namespace libfive
@@ -145,5 +150,8 @@ public: \
     T##_Installer() { \
         OracleClause::install<T>(#T); \
     }\
+    ~T##_Installer() { \
+        OracleClause::uninstall(#T); \
+    }\
 };\
 static T##_Installer T##_Installer_Instance;
diff --git a/libfive/src/oracle/oracle_clause.cpp b/libfive/src/oracle/oracle_clause.cpp
@@ -52,4 +52,10 @@ std::unique_ptr<const OracleClause> OracleClause::remap(
     return std::make_unique<TransformedOracleClause>(self, X_, Y_, Z_);
 }
 
+std::map<std::string, OracleClause::SerDe>& OracleClause::installed()
+{
+    static std::map<std::string, SerDe> m;
+    return m;
+}
+
 }   // namespace libfive