commit 318d5e033ccb81f54a8dd58d0083d31b4e0b907a
author Nicolas Capens <capn@google.com> Fri Nov 16 14:28:36 2018 -0500
committer Nicolas Capens <nicolascapens@google.com> Mon Nov 26 15:59:30 2018 +0000
tree 4e09e61db6e8257ce5fe0e8404058301b146d4ee
parent 70c419893f7f23b51468c681b0a0d5c78e52c733

Replace <memory.h> with <cstring>.

<memory.h> isn't actually an official standard C header.
memcpy() is defined in <string.h> / <cstring>.

Change-Id: I578e3a8ea741934e594049e359b906665de80134
Reviewed-on: https://swiftshader-review.googlesource.com/c/22649
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/Device/Sampler.cpp

diff --git a/src/Device/Sampler.cpp b/src/Device/Sampler.cpp
index 69f1916..e310c62 100644
--- a/src/Device/Sampler.cpp
+++ b/src/Device/Sampler.cpp
@@ -19,8 +19,7 @@
 #include "Pipeline/PixelRoutine.hpp"
 #include "System/Debug.hpp"
 
-#include <memory.h>
-#include <string.h>
+#include <cstring>
 
 namespace sw
 {

src/Pipeline/Constants.cpp

diff --git a/src/Pipeline/Constants.cpp b/src/Pipeline/Constants.cpp
index 25f08e2..a7f5a6b 100644
--- a/src/Pipeline/Constants.cpp
+++ b/src/Pipeline/Constants.cpp
@@ -17,7 +17,7 @@
 #include "System/Math.hpp"
 #include "System/Half.hpp"
 
-#include <memory.h>
+#include <cstring>
 
 namespace sw
 {

src/System/Memory.cpp

diff --git a/src/System/Memory.cpp b/src/System/Memory.cpp
index f44fc9e..0e73891 100644
--- a/src/System/Memory.cpp
+++ b/src/System/Memory.cpp
@@ -30,7 +30,7 @@
 	#include <unistd.h>
 #endif
 
-#include <memory.h>
+#include <cstring>
 
 #undef allocate
 #undef deallocate

src/Vulkan/VkBuffer.cpp

diff --git a/src/Vulkan/VkBuffer.cpp b/src/Vulkan/VkBuffer.cpp
index bde3352..c0e478c 100644
--- a/src/Vulkan/VkBuffer.cpp
+++ b/src/Vulkan/VkBuffer.cpp
@@ -15,7 +15,8 @@
 #include "VkBuffer.hpp"
 #include "VkConfig.h"
 #include "VkDeviceMemory.hpp"
-#include <memory.h>
+
+#include <cstring>
 
 namespace vk
 {

src/Vulkan/VkPhysicalDevice.cpp

diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 46486bb..3a18d97 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -14,7 +14,8 @@
 
 #include "VkPhysicalDevice.hpp"
 #include "VkConfig.h"
-#include <memory.h>
+
+#include <cstring>
 
 namespace vk
 {

src/Vulkan/VkShaderModule.cpp

diff --git a/src/Vulkan/VkShaderModule.cpp b/src/Vulkan/VkShaderModule.cpp
index 5be04e8..29bce29 100644
--- a/src/Vulkan/VkShaderModule.cpp
+++ b/src/Vulkan/VkShaderModule.cpp
@@ -13,7 +13,8 @@
 // limitations under the License.
 
 #include "VkShaderModule.hpp"
-#include <memory.h>
+
+#include <cstring>
 
 namespace vk
 {