1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
index 1442f547b08..c3c90e5aae4 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_pchanmap.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-struct GHash;
+#include "intern/depsgraph_type.h"
 
 namespace DEG {
 
@@ -42,13 +42,11 @@ struct RootPChanMap {
   bool has_common_root(const char *bone1, const char *bone2) const;
 
  protected:
-  /* The actual map:
-   * - Keys are "strings" (const char *) - not dynamically allocated.
-   * - Values are "sets" (const char *) - not dynamically allocated.
-   *
-   * We don't use the C++ maps here, as it's more convenient to use
-   * Blender's GHash and be able to compare by-value instead of by-ref. */
-  struct GHash *map_;
+  /**
+   * The strings are only referenced by this map. Users of RootPChanMap have to make sure that the
+   * life-time of the strings is long enough.
+   */
+  Map<StringRefNull, Set<StringRefNull>> map_;
 };
 
 }  // namespace DEG