OpenSubdiv: Refactor, move edge map to base folder

intern/opensubdiv/CMakeLists.txt

@@ -51,6 +51,7 @@ if(WITH_OPENSUBDIV)
 
   list(APPEND SRC
     # Base.
+    internal/base/edge_map.h
     internal/base/memory.h
 
     # Device.
@@ -78,7 +79,6 @@ if(WITH_OPENSUBDIV)
     internal/opensubdiv_util.cc
 
     internal/opensubdiv_converter_internal.h
-    internal/opensubdiv_edge_map.h
     internal/opensubdiv_evaluator_internal.h
     internal/opensubdiv_internal.h
     internal/opensubdiv_util.h

intern/opensubdiv/internal/base/edge_map.h

@@ -16,8 +16,8 @@
 //
 // Author: Sergey Sharybin
 
-#ifndef OPENSUBDIV_EDGE_MAP_H_
-#define OPENSUBDIV_EDGE_MAP_H_
+#ifndef OPENSUBDIV_BASE_EDGE_MAP_H_
+#define OPENSUBDIV_BASE_EDGE_MAP_H_
 
 #include "internal/opensubdiv_util.h"
 
@@ -159,4 +159,4 @@ template<> struct hash<blender::opensubdiv::EdgeKey> {
 
 }  // namespace std
 
-#endif  // OPENSUBDIV_EDGE_MAP_H_
+#endif  // OPENSUBDIV_BASE_EDGE_MAP_H_

intern/opensubdiv/internal/topology/topology_refiner_capi.cc

@@ -19,8 +19,8 @@
 #include "opensubdiv_topology_refiner_capi.h"
 
 #include "MEM_guardedalloc.h"
+#include "internal/base/edge_map.h"
 #include "internal/opensubdiv_converter_internal.h"
-#include "internal/opensubdiv_edge_map.h"
 #include "internal/opensubdiv_internal.h"
 #include "internal/opensubdiv_util.h"
 #include "internal/topology/topology_refiner_impl.h"