resolve merge conflicts of eb48f49dd to oc-dev

[platform/upstream/VK-GL-CTS.git] / execserver / tools / xsTest.cpp

diff --git a/execserver/tools/xsTest.cpp b/execserver/tools/xsTest.cpp
index 5e47377..44483dc 100644 (file)
--- a/execserver/tools/xsTest.cpp
+++ b/execserver/tools/xsTest.cpp
@@ -30,6 +30,7 @@
 #include "deBlockBuffer.hpp"
 #include "deThread.hpp"
 #include "deStringUtil.hpp"
+#include "deUniquePtr.hpp"
 
 #include "deClock.h"
 #include "deProcess.h"
@@ -45,7 +46,7 @@ using std::vector;
 namespace xs
 {
 
-typedef std::auto_ptr<Message> ScopedMsgPtr;
+typedef de::UniquePtr<Message> ScopedMsgPtr;
 
 class SocketError : public Error
 {