2.0.0.2: Moved safe_ptr from utility to memory folder.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@333 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/common.vcxproj b/common/common.vcxproj
index b0f850144f51606f0347efcb938807326039284e..977a66114a7b803e7d3be684eb7b00d8812a05fd 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -103,8 +103,8 @@
     <ClInclude Include="io\SocketInfo.h" />\r
     <ClInclude Include="log\log.h" />\r
     <ClInclude Include="memory\page_locked_allocator.h" />\r
+    <ClInclude Include="memory\safe_ptr.h" />\r
     <ClInclude Include="stdafx.h" />\r
-    <ClInclude Include="utility\safe_ptr.h" />\r
     <ClInclude Include="utility\string_convert.h" />\r
     <ClInclude Include="utility\timer.h" />\r
   </ItemGroup>\r

diff --git a/common/common.vcxproj.filters b/common/common.vcxproj.filters
index 525a264a9571b575c2c5bd2d7194c33a4e5d3641..734dc67ea3103ba460d3062201be65030350cf24 100644 (file)
--- a/common/common.vcxproj.filters
+++ b/common/common.vcxproj.filters
@@ -93,9 +93,6 @@
     <ClInclude Include="utility\timer.h">\r
       <Filter>Source\utility</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="utility\safe_ptr.h">\r
-      <Filter>Source\utility</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="utility\string_convert.h">\r
       <Filter>Source\utility</Filter>\r
     </ClInclude>\r
@@ -105,5 +102,8 @@
     <ClInclude Include="memory\page_locked_allocator.h">\r
       <Filter>Source\memory</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="memory\safe_ptr.h">\r
+      <Filter>Source\memory</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/common/io/AsyncEventServer.h b/common/io/AsyncEventServer.h
index 37e9c8875ccaecd7c3d81cfc6b03753c07438c26..4c1f0ec3ccde7e26c19e4463a60dbbe706c851d9 100644 (file)
--- a/common/io/AsyncEventServer.h
+++ b/common/io/AsyncEventServer.h
@@ -28,7 +28,7 @@
 #pragma once\r
 #endif\r
 \r
-#include "../utility/safe_ptr.h"\r
+#include "../memory/safe_ptr.h"\r
 \r
 #include <string>\r
 #include <map>\r

diff --git a/common/utility/safe_ptr.h b/common/memory/safe_ptr.h
similarity index 100%
rename from common/utility/safe_ptr.h
rename to common/memory/safe_ptr.h

diff --git a/core/StdAfx.h b/core/StdAfx.h
index 59192e4bb7f34ed43b3f7385b38dc76ef2154f9b..39d599016d46a296120fcb737385bd4af56f06ea 100644 (file)
--- a/core/StdAfx.h
+++ b/core/StdAfx.h
@@ -75,7 +75,7 @@
 #include <SFML/Audio.hpp>\r
 \r
 #include "../common/utility/string_convert.h"\r
-#include "../common/utility/safe_ptr.h"\r
+#include "../common/memory/safe_ptr.h"\r
 //#include "../common/concurrency/executor.h" // Can't include this due to MSVC lambda bug\r
 \r
 #include "../common/log/Log.h"\r

diff --git a/core/channel.h b/core/channel.h
index 99a125755fea8a9f3152b1f7e38ed05517d4b3b5..d393565636c1c6597538d5e6c98c06055d221ca6 100644 (file)
--- a/core/channel.h
+++ b/core/channel.h
@@ -3,7 +3,7 @@
 #include "consumer/frame_consumer.h"\r
 #include "producer/frame_producer.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 #include <boost/thread/future.hpp>\r

diff --git a/core/consumer/frame_consumer.h b/core/consumer/frame_consumer.h
index 8b01c6ffe609c39d29289641e2d09c499e4fe17f..48b7de41170837582e8d6ec35657c605c5ed38ae 100644 (file)
--- a/core/consumer/frame_consumer.h
+++ b/core/consumer/frame_consumer.h
@@ -19,7 +19,7 @@
 */\r
 #pragma once\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r

diff --git a/core/consumer/frame_consumer_device.h b/core/consumer/frame_consumer_device.h
index 27cf597691ebf5672878ac0c7c91b04db8755044..c978c505d36a89ded2692c0da344c39de0ac3492 100644 (file)
--- a/core/consumer/frame_consumer_device.h
+++ b/core/consumer/frame_consumer_device.h
@@ -2,7 +2,7 @@
 \r
 #include "../consumer/frame_consumer.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <vector>\r
 \r

diff --git a/core/consumer/ogl/ogl_consumer.cpp b/core/consumer/ogl/ogl_consumer.cpp
index 3c28f80772de4b591ea59a8106712acb3a804418..50205c608ed8a2ca3a7a2ea8d84eccf3e1c2adec 100644 (file)
--- a/core/consumer/ogl/ogl_consumer.cpp
+++ b/core/consumer/ogl/ogl_consumer.cpp
@@ -27,7 +27,7 @@
 \r
 #include <common/gl/gl_check.h>\r
 #include <common/concurrency/executor.h>\r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/thread.hpp>\r
 \r

diff --git a/core/processor/frame_processor_device.h b/core/processor/frame_processor_device.h
index 04cacd55defdda50439825ed61016ccb11d1236b..3e8a01ddf4da745c24cc8157b5d6acd95e77092e 100644 (file)
--- a/core/processor/frame_processor_device.h
+++ b/core/processor/frame_processor_device.h
@@ -26,7 +26,7 @@
 \r
 #include "../format/video_format.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <tbb/concurrent_queue.h>\r
 \r

diff --git a/core/processor/ogl_device.h b/core/processor/ogl_device.h
index 35a95dcdc272f0acfa4a033a482ddd17860929f7..fe438e56ff43b00ed8bf43e485a23a8b8e3918be 100644 (file)
--- a/core/processor/ogl_device.h
+++ b/core/processor/ogl_device.h
@@ -4,7 +4,7 @@
 #include "device_buffer.h"\r
 \r
 #include <common/concurrency/executor.h>\r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <tbb/concurrent_unordered_map.h>\r
 #include <tbb/concurrent_queue.h>\r

diff --git a/core/processor/read_frame.h b/core/processor/read_frame.h
index 7e2b10e5e6a1506632ed617b70fc110ea2a3ad6f..100bc6f70db95cd8b4ce010f7413225b4edcf9f3 100644 (file)
--- a/core/processor/read_frame.h
+++ b/core/processor/read_frame.h
@@ -8,7 +8,7 @@
 #include <memory>\r
 #include <vector>\r
 \r
-#include "../../common/utility/safe_ptr.h"\r
+#include "../../common/memory/safe_ptr.h"\r
 \r
 namespace caspar { namespace core {\r
        \r

diff --git a/core/producer/ffmpeg/ffmpeg_producer.h b/core/producer/ffmpeg/ffmpeg_producer.h
index 8be774089f0e842f73b92e01822ed119b2116da6..a4c0520cc935869714af4d19e8df4a3ad7bc1761 100644 (file)
--- a/core/producer/ffmpeg/ffmpeg_producer.h
+++ b/core/producer/ffmpeg/ffmpeg_producer.h
@@ -2,7 +2,7 @@
 \r
 #include "../frame_producer.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <string>\r
 #include <vector>\r

diff --git a/core/producer/ffmpeg/video/video_decoder.cpp b/core/producer/ffmpeg/video/video_decoder.cpp
index 87716cce76117a80adf14ce34cfe3aa2bda41fc3..0524543c730e4e847b2bf085dd53cd5c5705c79a 100644 (file)
--- a/core/producer/ffmpeg/video/video_decoder.cpp
+++ b/core/producer/ffmpeg/video/video_decoder.cpp
@@ -6,7 +6,7 @@
 #include "../../../processor/draw_frame.h"\r
 #include "../../../processor/frame_processor_device.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <tbb/parallel_for.h>\r
 \r

diff --git a/core/producer/frame_producer.h b/core/producer/frame_producer.h
index 1878bd071e97555a42ec40d88b4a1c959dc22958..e45b7ad29892d8add3266c58599d5c5437b6b036 100644 (file)
--- a/core/producer/frame_producer.h
+++ b/core/producer/frame_producer.h
@@ -22,7 +22,7 @@
 #include "../processor/draw_frame.h"\r
 #include "../processor/frame_processor_device.h"\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r

diff --git a/core/producer/layer.cpp b/core/producer/layer.cpp
index b32cdc568873be8070443b46c93f37c277cee36f..05754fae06fdef1e132e28c0b39443883bc21a53 100644 (file)
--- a/core/producer/layer.cpp
+++ b/core/producer/layer.cpp
@@ -17,10 +17,10 @@ struct layer::implementation : boost::noncopyable
        safe_ptr<draw_frame>            last_frame_;\r
        safe_ptr<frame_producer>        foreground_;\r
        safe_ptr<frame_producer>        background_;\r
-       const size_t                            index_;\r
+       const int                                       index_;\r
 \r
 public:\r
-       implementation(size_t index) \r
+       implementation(int index) \r
                : foreground_(frame_producer::empty())\r
                , background_(frame_producer::empty())\r
                , last_frame_(draw_frame::empty())\r
@@ -109,7 +109,7 @@ public:
        }\r
 };\r
 \r
-layer::layer(size_t index) : impl_(new implementation(index)){}\r
+layer::layer(int index) : impl_(new implementation(index)){}\r
 layer::layer(layer&& other) : impl_(std::move(other.impl_)){other.impl_ = nullptr;}\r
 layer& layer::operator=(layer&& other)\r
 {\r

diff --git a/core/producer/layer.h b/core/producer/layer.h
index 0b353a36b4acb8b5077120db959e22e6081cea7d..dabb839fb548711349e834574d9b6ccc76c9d11d 100644 (file)
--- a/core/producer/layer.h
+++ b/core/producer/layer.h
@@ -1,6 +1,6 @@
 #pragma once\r
 \r
-#include <common/utility/safe_ptr.h>\r
+#include <common/memory/safe_ptr.h>\r
 \r
 #include <boost/noncopyable.hpp>\r
 \r
@@ -12,7 +12,7 @@ class draw_frame;
 class layer : boost::noncopyable\r
 {\r
 public:\r
-       layer(size_t index = -1); // nothrow\r
+       layer(int index = -1); // nothrow\r
        layer(layer&& other); // nothrow\r
        layer& operator=(layer&& other); // nothrow\r
        \r