[ffmpeg] Ported 2.0.7 ffmpeg producer to 2.1.0 while still keeping the usage of the...

[casparcg] / common / memory.h

diff --git a/common/memory.h b/common/memory.h
index 8bf205e16dcebb76b1bec80a14e2d545e0701adb..810db56f024ca2e491c5a8385ab5853c7dd0d5b0 100644 (file)
--- a/common/memory.h
+++ b/common/memory.h
@@ -113,8 +113,7 @@ public:
         p_.swap(other.p_); 
     } 
        
-    template<class D, class T2> 
-    D* get_deleter(shared_ptr<T2> const& ptr) 
+    D& get_deleter()
     { 
         return p_.get_deleter(); 
     }
@@ -269,7 +268,7 @@ unique_ptr<T> const_pointer_cast(const unique_ptr<T2>& p)
 template <class T, class T2>
 unique_ptr<T> dynamic_pointer_cast(const unique_ptr<T2>& p)
 {
-    aT2to temp = std::dynamic_pointer_cast<T>(std::unique_ptr<T2>(p));
+    auto temp = std::dynamic_pointer_cast<T>(std::unique_ptr<T2>(p));
     if(!temp)
         throw std::bad_cast();
     return unique_ptr<T>(std::move(temp));
@@ -448,16 +447,16 @@ public:
     { 
         return p_.owner_before(ptr); 
     }
-
-    template<class D, class T2> 
-    D* get_deleter(shared_ptr<T2> const& ptr) 
-    { 
-        return p_.get_deleter(); 
-    }
 private:    
     std::shared_ptr<T> p_;
 };
 
+template<class D, class T>
+D* get_deleter(shared_ptr<T> const& ptr)
+{
+    return ptr.get_deleter();
+}
+
 template<class T, class T2>
 bool operator==(const shared_ptr<T>& a, const shared_ptr<T2>& b)
 {
@@ -599,7 +598,7 @@ shared_ptr<T> const_pointer_cast(const shared_ptr<T2>& p)
 template <class T, class T2>
 shared_ptr<T> dynamic_pointer_cast(const shared_ptr<T2>& p)
 {
-    aT2to temp = std::dynamic_pointer_cast<T>(std::shared_ptr<T2>(p));
+    auto temp = std::dynamic_pointer_cast<T>(std::shared_ptr<T2>(p));
     if(!temp)
         throw std::bad_cast();
     return shared_ptr<T>(std::move(temp));
@@ -716,6 +715,30 @@ shared_ptr<T> make_shared(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5,
     return shared_ptr<T>(std::make_shared<T>(std::forward<P0>(p0), std::forward<P1>(p1), std::forward<P2>(p2), std::forward<P3>(p3), std::forward<P4>(p4), std::forward<P5>(p5), std::forward<P6>(p6), std::forward<P7>(p7)));
 }
 
+template<typename T, typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
+shared_ptr<T> make_shared(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, P7&& p7, P8&& p8)
+{
+       return shared_ptr<T>(std::make_shared<T>(std::forward<P0>(p0), std::forward<P1>(p1), std::forward<P2>(p2), std::forward<P3>(p3), std::forward<P4>(p4), std::forward<P5>(p5), std::forward<P6>(p6), std::forward<P7>(p7), std::forward<P8>(p8)));
+}
+
+template<typename T, typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9>
+shared_ptr<T> make_shared(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, P7&& p7, P8&& p8, P9&& p9)
+{
+       return shared_ptr<T>(std::make_shared<T>(std::forward<P0>(p0), std::forward<P1>(p1), std::forward<P2>(p2), std::forward<P3>(p3), std::forward<P4>(p4), std::forward<P5>(p5), std::forward<P6>(p6), std::forward<P7>(p7), std::forward<P8>(p8), std::forward<P9>(p9)));
+}
+
+template<typename T, typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
+shared_ptr<T> make_shared(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, P7&& p7, P8&& p8, P9&& p9, P10&& p10)
+{
+       return shared_ptr<T>(std::make_shared<T>(std::forward<P0>(p0), std::forward<P1>(p1), std::forward<P2>(p2), std::forward<P3>(p3), std::forward<P4>(p4), std::forward<P5>(p5), std::forward<P6>(p6), std::forward<P7>(p7), std::forward<P8>(p8), std::forward<P9>(p9), std::forward<P10>(p10)));
+}
+
+template<typename T, typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11>
+shared_ptr<T> make_shared(P0&& p0, P1&& p1, P2&& p2, P3&& p3, P4&& p4, P5&& p5, P6&& p6, P7&& p7, P8&& p8, P9&& p9, P10&& p10, P11&& p11)
+{
+       return shared_ptr<T>(std::make_shared<T>(std::forward<P0>(p0), std::forward<P1>(p1), std::forward<P2>(p2), std::forward<P3>(p3), std::forward<P4>(p4), std::forward<P5>(p5), std::forward<P6>(p6), std::forward<P7>(p7), std::forward<P8>(p8), std::forward<P9>(p9), std::forward<P10>(p10), std::forward<P11>(p11)));
+}
+
 template<typename T>
 shared_ptr<T>::shared_ptr() 
     : p_(make_shared<T>())