1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cache.h b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
index bb4e1f5c96a..6e159f55c94 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cache.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cache.h
@@ -31,7 +31,8 @@ struct ID;
 struct PointerRNA;
 struct PropertyRNA;
 
-namespace DEG {
+namespace blender {
+namespace deg {
 
 class DepsgraphBuilderCache;
 
@@ -45,8 +46,6 @@ class AnimatedPropertyID {
   AnimatedPropertyID(ID *id, StructRNA *type, void *data, const char *property_name);
 
   uint32_t hash() const;
-
-  bool operator<(const AnimatedPropertyID &other) const;
   friend bool operator==(const AnimatedPropertyID &a, const AnimatedPropertyID &b);
 
   /* Corresponds to PointerRNA.data. */
@@ -73,8 +72,6 @@ class AnimatedPropertyStorage {
   Set<AnimatedPropertyID> animated_properties_set;
 };
 
-typedef map<ID *, AnimatedPropertyStorage *> AnimatedPropertyStorageMap;
-
 /* Cached data which can be re-used by multiple builders. */
 class DepsgraphBuilderCache {
  public:
@@ -100,7 +97,8 @@ class DepsgraphBuilderCache {
     return animated_property_storage->isPropertyAnimated(args...);
   }
 
-  AnimatedPropertyStorageMap animated_property_storage_map_;
+  Map<ID *, AnimatedPropertyStorage *> animated_property_storage_map_;
 };
 
-}  // namespace DEG
+}  // namespace deg
+}  // namespace blender