Rename Memory to MemoryUtils

gwaldron · May 24, 2024 · f3d893d · f3d893d
1 parent 2d14cb8
commit f3d893d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
@@ -292,7 +292,7 @@ SET(LIB_PUBLIC_HEADERS
     MBTiles
     MeasureTool
     MemCache
-    Memory
+    MemoryUtils
     MeshConsolidator
     MeshFlattener
     MeshSubdivider
@@ -707,7 +707,7 @@ set(TARGET_SRC
     MBTiles.cpp
     MeasureTool.cpp
     MemCache.cpp
-    Memory.cpp
+    MemoryUtils.cpp
     MeshConsolidator.cpp
     MeshFlattener.cpp
     MeshSubdivider.cpp

diff --git a/src/osgEarth/ImGui/RenderingGUI b/src/osgEarth/ImGui/RenderingGUI
@@ -20,7 +20,7 @@
 
 #include "ImGui"
 #include <osgEarth/Threading>
-#include <osgEarth/Memory>
+#include <osgEarth/MemoryUtils>
 #include <osgEarth/GLUtils>
 #include <osgEarth/ShaderLoader>
 #include <chrono>

diff --git a/src/osgEarth/ImGui/SystemGUI b/src/osgEarth/ImGui/SystemGUI
@@ -21,7 +21,7 @@
 
 #include "ImGui"
 #include <osgEarth/Threading>
-#include <osgEarth/Memory>
+#include <osgEarth/MemoryUtils>
 #include <osgEarth/GLUtils>
 #include <osgEarth/ShaderLoader>
 #include <osgEarth/Registry>

diff --git a/src/osgEarth/ImGui/TerrainGUI b/src/osgEarth/ImGui/TerrainGUI
@@ -20,7 +20,7 @@
 
 #include "ImGui"
 #include <osgEarth/Threading>
-#include <osgEarth/Memory>
+#include <osgEarth/MemoryUtils>
 #include <osgEarth/GLUtils>
 #include <osgEarth/ExampleResources>
 #include <osgEarth/FeatureNode>

diff --git a/src/osgEarth/Memory → src/osgEarth/MemoryUtils b/src/osgEarth/Memory → src/osgEarth/MemoryUtils
diff --git a/src/osgEarth/Memory.cpp → src/osgEarth/MemoryUtils.cpp b/src/osgEarth/Memory.cpp → src/osgEarth/MemoryUtils.cpp
@@ -19,7 +19,7 @@
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>
 */
-#include "Memory"
+#include "MemoryUtils"
 
 using namespace osgEarth::Util;
 

diff --git a/src/osgEarth/Metrics.cpp b/src/osgEarth/Metrics.cpp
@@ -21,7 +21,7 @@
 #include <osgEarth/Metrics>
 #include <osgViewer/ViewerBase>
 #include <osgViewer/View>
-#include <osgEarth/Memory>
+#include <osgEarth/MemoryUtils>
 #include <stdlib.h>
 
 using namespace osgEarth::Util;

diff --git a/src/osgEarth/Registry.cpp b/src/osgEarth/Registry.cpp
@@ -24,7 +24,7 @@
 #include "TerrainEngineNode"
 #include "GLUtils"
 #include "Chonk"
-#include "Memory"
+#include "MemoryUtils"
 
 #include <osg/ArgumentParser>
 #include <osgText/Font>