[Bf-blender-cvs] [7b4a2d578f6] functions: rename BLI_memory.h to BLI_memory_utils_cxx.h

[Jacques Lucke]

Commit: 7b4a2d578f6a6e302bee0e03639b92d35d5fd1eb
Author: Jacques Lucke
Date:   Thu Sep 12 12:48:36 2019 +0200
Branches: functions
https://developer.blender.org/rB7b4a2d578f6a6e302bee0e03639b92d35d5fd1eb

rename BLI_memory.h to BLI_memory_utils_cxx.h

===================================================================

M	source/blender/blenlib/BLI_array_cxx.h
M	source/blender/blenlib/BLI_array_ref.h
R100	source/blender/blenlib/BLI_memory.h	source/blender/blenlib/BLI_memory_utils_cxx.h
M	source/blender/blenlib/BLI_open_addressing.h
M	source/blender/blenlib/BLI_vector.h
M	source/blender/blenlib/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenlib/BLI_array_cxx.h b/source/blender/blenlib/BLI_array_cxx.h
index d681d86c135..2c1b29d89c7 100644
--- a/source/blender/blenlib/BLI_array_cxx.h
+++ b/source/blender/blenlib/BLI_array_cxx.h
@@ -26,7 +26,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_allocator.h"
 #include "BLI_array_ref.h"
-#include "BLI_memory.h"
+#include "BLI_memory_utils_cxx.h"
 
 namespace BLI {
 
diff --git a/source/blender/blenlib/BLI_array_ref.h b/source/blender/blenlib/BLI_array_ref.h
index 24dbb27fa86..a771d1c1329 100644
--- a/source/blender/blenlib/BLI_array_ref.h
+++ b/source/blender/blenlib/BLI_array_ref.h
@@ -41,7 +41,7 @@
 #include <string>
 
 #include "BLI_utildefines.h"
-#include "BLI_memory.h"
+#include "BLI_memory_utils_cxx.h"
 #include "BLI_index_range.h"
 
 namespace BLI {
diff --git a/source/blender/blenlib/BLI_memory.h b/source/blender/blenlib/BLI_memory_utils_cxx.h
similarity index 100%
rename from source/blender/blenlib/BLI_memory.h
rename to source/blender/blenlib/BLI_memory_utils_cxx.h
diff --git a/source/blender/blenlib/BLI_open_addressing.h b/source/blender/blenlib/BLI_open_addressing.h
index 805d08a0696..48d59472fe2 100644
--- a/source/blender/blenlib/BLI_open_addressing.h
+++ b/source/blender/blenlib/BLI_open_addressing.h
@@ -33,7 +33,7 @@
 #include <cmath>
 
 #include "BLI_utildefines.h"
-#include "BLI_memory.h"
+#include "BLI_memory_utils_cxx.h"
 #include "BLI_math_base.h"
 #include "BLI_allocator.h"
 
diff --git a/source/blender/blenlib/BLI_vector.h b/source/blender/blenlib/BLI_vector.h
index dac2ce9abee..63e9a31e9ed 100644
--- a/source/blender/blenlib/BLI_vector.h
+++ b/source/blender/blenlib/BLI_vector.h
@@ -31,7 +31,7 @@
 #include <memory>
 
 #include "BLI_utildefines.h"
-#include "BLI_memory.h"
+#include "BLI_memory_utils_cxx.h"
 #include "BLI_array_ref.h"
 #include "BLI_listbase_wrapper.h"
 #include "BLI_math_base.h"
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index ea3c853b346..acaf1daf7e0 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -250,7 +250,7 @@ set(SRC
   BLI_refcount.h
   BLI_vector.h
   BLI_map.h
-  BLI_memory.h
+  BLI_memory_utils_cxx.h
   BLI_multi_map.h
   BLI_set.h
   BLI_set_vector.h