passenger 4.0.20 → 4.0.21

data/ext/boost/thread/detail/is_convertible.hpp

@@ -0,0 +1,48 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+// (C) Copyright 2011-2012 Vicente J. Botet Escriba
+// Software License, Version 1.0. (See accompanying file
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/thread for documentation.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BOOST_THREAD_DETAIL_IS_CONVERTIBLE_HPP
+#define BOOST_THREAD_DETAIL_IS_CONVERTIBLE_HPP
+
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/thread/detail/move.hpp>
+
+namespace boost
+{
+  namespace thread_detail
+  {
+    template <typename T1, typename T2>
+    struct is_convertible : boost::is_convertible<T1,T2> {};
+
+#if defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+
+#if defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 1300)
+
+#if defined BOOST_THREAD_USES_MOVE
+    template <typename T1, typename T2>
+    struct is_convertible<
+      rv<T1> &,
+      rv<rv<T2> > &
+    > : false_type {};
+#endif
+
+#elif defined __GNUC__ && (__GNUC__ < 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ <= 4 ))
+
+    template <typename T1, typename T2>
+    struct is_convertible<T1&, T2&> : boost::is_convertible<T1, T2> {};
+#endif
+
+#endif
+  }
+
+} // namespace boost
+
+
+#endif //  BOOST_THREAD_DETAIL_MEMORY_HPP

data/ext/boost/thread/detail/lockable_wrapper.hpp

@@ -0,0 +1,45 @@
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// (C) Copyright 2012 Vicente J. Botet Escriba
+
+#ifndef BOOST_THREAD_DETAIL_LOCKABLE_WRAPPER_HPP
+#define BOOST_THREAD_DETAIL_LOCKABLE_WRAPPER_HPP
+
+#include <boost/thread/detail/config.hpp>
+
+#if ! defined BOOST_THREAD_NO_CXX11_HDR_INITIALIZER_LIST
+#include <initializer_list>
+#endif
+#include <boost/config/abi_prefix.hpp>
+
+namespace boost
+{
+
+#if ! defined BOOST_THREAD_NO_CXX11_HDR_INITIALIZER_LIST
+  namespace thread_detail
+  {
+    template <typename Mutex>
+    struct lockable_wrapper
+    {
+      Mutex* m;
+      explicit lockable_wrapper(Mutex& m_) :
+        m(&m_)
+      {}
+    };
+    template <typename Mutex>
+    struct lockable_adopt_wrapper
+    {
+      Mutex* m;
+      explicit lockable_adopt_wrapper(Mutex& m_) :
+        m(&m_)
+      {}
+    };
+  }
+#endif
+
+}
+
+#include <boost/config/abi_suffix.hpp>
+
+#endif // header

data/ext/boost/thread/detail/log.hpp

@@ -0,0 +1,83 @@
+// Copyright (C) 2012 Vicente J. Botet Escriba
+//
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_THREAD_DETAIL_LOG_HPP
+#define BOOST_THREAD_DETAIL_LOG_HPP
+
+#include <boost/thread/detail/config.hpp>
+#if defined BOOST_THREAD_USES_LOG
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/lock_guard.hpp>
+#if defined BOOST_THREAD_USES_LOG_THREAD_ID
+#include <boost/thread/thread.hpp>
+#endif
+#include <iostream>
+
+namespace boost
+{
+  namespace thread_detail
+  {
+    inline boost::recursive_mutex& terminal_mutex()
+    {
+      static boost::recursive_mutex mtx;
+      return mtx;
+    }
+
+  }
+}
+#if defined BOOST_THREAD_USES_LOG_THREAD_ID
+
+#define BOOST_THREAD_LOG \
+  { \
+    boost::lock_guard<boost::recursive_mutex> _lk_(boost::thread_detail::terminal_mutex()); \
+    std::cout << boost::this_thread::get_id() << " - "<<__FILE__<<"["<<__LINE__<<"] " <<std::dec
+#else
+
+#define BOOST_THREAD_LOG \
+{ \
+  boost::lock_guard<boost::recursive_mutex> _lk_(boost::thread_detail::terminal_mutex()); \
+  std::cout << __FILE__<<"["<<__LINE__<<"] " <<std::dec
+
+#endif
+#define BOOST_THREAD_END_LOG \
+    std::dec << std::endl; \
+  }
+
+#else
+
+namespace boost
+{
+  namespace thread_detail
+  {
+    struct dummy_stream_t
+    {
+    };
+
+    template <typename T>
+    inline dummy_stream_t const& operator<<(dummy_stream_t const& os, T)
+    {
+      return os;
+    }
+
+    inline dummy_stream_t const& operator<<(dummy_stream_t const& os, dummy_stream_t const&)
+    {
+      return os;
+    }
+
+
+    BOOST_CONSTEXPR_OR_CONST dummy_stream_t dummy_stream = {};
+
+  }
+}
+
+#define BOOST_THREAD_LOG if (true) {} else boost::thread_detail::dummy_stream
+#define BOOST_THREAD_END_LOG boost::thread_detail::dummy_stream
+
+#endif
+
+#define BOOST_THREAD_TRACE BOOST_THREAD_LOG << BOOST_THREAD_END_LOG
+
+
+#endif // header

data/ext/boost/thread/detail/make_tuple_indices.hpp

@@ -0,0 +1,224 @@
+// Copyright (C) 2012-2013 Vicente J. Botet Escriba
+//
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+// 2013/04 Vicente J. Botet Escriba
+//   Provide implementation up to 10 parameters when BOOST_NO_CXX11_VARIADIC_TEMPLATES is defined.
+// 2012/11 Vicente J. Botet Escriba
+//   Adapt to boost libc++ implementation
+
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+// The make_tuple_indices C++11 code is based on the one from libcxx.
+//===----------------------------------------------------------------------===//
+
+#ifndef BOOST_THREAD_DETAIL_MAKE_TUPLE_INDICES_HPP
+#define BOOST_THREAD_DETAIL_MAKE_TUPLE_INDICES_HPP
+
+#include <boost/config.hpp>
+#include <boost/static_assert.hpp>
+
+namespace boost
+{
+  namespace detail
+  {
+
+#if ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+    // make_tuple_indices
+
+    template <std::size_t...> struct tuple_indices
+    {};
+
+    template <std::size_t Sp, class IntTuple, std::size_t Ep>
+    struct make_indices_imp;
+
+    template <std::size_t Sp, std::size_t ...Indices, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<Indices...>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<Indices..., Sp>, Ep>::type type;
+    };
+
+    template <std::size_t Ep, std::size_t ...Indices>
+    struct make_indices_imp<Ep, tuple_indices<Indices...>, Ep>
+    {
+      typedef tuple_indices<Indices...> type;
+    };
+
+    template <std::size_t Ep, std::size_t Sp = 0>
+    struct make_tuple_indices
+    {
+      BOOST_STATIC_ASSERT_MSG(Sp <= Ep, "make_tuple_indices input error");
+      typedef typename make_indices_imp<Sp, tuple_indices<>, Ep>::type type;
+    };
+#else
+
+    // - tuple forward declaration -----------------------------------------------
+    template <
+      std::size_t T0 = 0, std::size_t T1 = 0, std::size_t T2 = 0,
+      std::size_t T3 = 0, std::size_t T4 = 0, std::size_t T5 = 0,
+      std::size_t T6 = 0, std::size_t T7 = 0, std::size_t T8 = 0,
+      std::size_t T9 = 0>
+    class tuple_indices {};
+
+    template <std::size_t Sp, class IntTuple, std::size_t Ep>
+    struct make_indices_imp;
+
+    template <std::size_t Sp, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5, std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4, I5>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, I5, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4, I5, I6>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, I5, I6, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t I7
+    , std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4, I5, I6, I7>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, Sp>, Ep>::type type;
+    };
+    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t I7
+    , std::size_t I8
+    , std::size_t Ep>
+    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4, I5, I6, I7, I8>, Ep>
+    {
+      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8, Sp>, Ep>::type type;
+    };
+//    template <std::size_t Sp, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+//    , std::size_t I6
+//    , std::size_t I7
+//    , std::size_t I8
+//    , std::size_t I9
+//    , std::size_t Ep>
+//    struct make_indices_imp<Sp, tuple_indices<I0, I1 , I2, I3, I4, I5, I6, I7, I8, I9>, Ep>
+//    {
+//      typedef typename make_indices_imp<Sp+1, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8, I9, Sp>, Ep>::type type;
+//    };
+
+    template <std::size_t Ep>
+    struct make_indices_imp<Ep, tuple_indices<>, Ep>
+    {
+      typedef tuple_indices<> type;
+    };
+    template <std::size_t Ep, std::size_t I0>
+    struct make_indices_imp<Ep, tuple_indices<I0>, Ep>
+    {
+      typedef tuple_indices<I0> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1>
+    struct make_indices_imp<Ep, tuple_indices<I0, I1>, Ep>
+    {
+      typedef tuple_indices<I0, I1> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2>
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3>
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4>
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5>
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4, I5>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4, I5> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    >
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4, I5, I6>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4, I5, I6> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t I7
+    >
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7> type;
+    };
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t I7
+    , std::size_t I8
+    >
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8> type;
+    };
+
+    template <std::size_t Ep, std::size_t I0, std::size_t I1, std::size_t I2, std::size_t I3, std::size_t I4, std::size_t I5
+    , std::size_t I6
+    , std::size_t I7
+    , std::size_t I8
+    , std::size_t I9
+    >
+    struct make_indices_imp<Ep, tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8, I9>, Ep>
+    {
+      typedef tuple_indices<I0, I1, I2, I3, I4, I5, I6, I7, I8, I9> type;
+    };
+
+    template <std::size_t Ep, std::size_t Sp = 0>
+    struct make_tuple_indices
+    {
+      BOOST_STATIC_ASSERT_MSG(Sp <= Ep, "make_tuple_indices input error");
+      typedef typename make_indices_imp<Sp, tuple_indices<>, Ep>::type type;
+    };
+
+#endif
+  }
+}
+
+#endif // header

data/ext/boost/thread/detail/move.hpp

@@ -17,7 +17,8 @@
 #endif
 
 #include <boost/thread/detail/delete.hpp>
-#include <boost/move/move.hpp>
+#include <boost/move/utility.hpp>
+#include <boost/move/traits.hpp>
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
@@ -26,7 +27,7 @@ namespace boost
     namespace detail
     {
       template <typename T>
-      struct has_move_emulation_enabled_aux_dummy_specialization;
+      struct enable_move_utility_emulation_dummy_specialization;
         template<typename T>
         struct thread_move_t
         {
@@ -49,6 +50,7 @@ namespace boost
         };
     }
 
+#if !defined BOOST_THREAD_USES_MOVE
 
 #ifndef BOOST_NO_SFINAE
     template<typename T>
@@ -63,11 +65,14 @@ namespace boost
     {
         return t;
     }
+
+#endif   //#if !defined BOOST_THREAD_USES_MOVE
 }
 
 #if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
 
 #define BOOST_THREAD_RV_REF(TYPE) BOOST_RV_REF(TYPE)
+#define BOOST_THREAD_RV_REF_2_TEMPL_ARGS(TYPE) BOOST_RV_REF_2_TEMPL_ARGS(TYPE)
 #define BOOST_THREAD_RV_REF_BEG BOOST_RV_REF_BEG
 #define BOOST_THREAD_RV_REF_END BOOST_RV_REF_END
 #define BOOST_THREAD_RV(V) V
@@ -77,16 +82,17 @@ namespace boost
 #define BOOST_THREAD_DCL_MOVABLE_BEG(T) \
   namespace detail { \
     template <typename T> \
-    struct has_move_emulation_enabled_aux_dummy_specialization<
+    struct enable_move_utility_emulation_dummy_specialization<
 
 #define BOOST_THREAD_DCL_MOVABLE_END > \
-      : integral_constant<bool, true> \
+      : integral_constant<bool, false> \
       {}; \
     }
 
 #elif ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES && defined  BOOST_MSVC
 
 #define BOOST_THREAD_RV_REF(TYPE) BOOST_RV_REF(TYPE)
+#define BOOST_THREAD_RV_REF_2_TEMPL_ARGS(TYPE) BOOST_RV_REF_2_TEMPL_ARGS(TYPE)
 #define BOOST_THREAD_RV_REF_BEG BOOST_RV_REF_BEG
 #define BOOST_THREAD_RV_REF_END BOOST_RV_REF_END
 #define BOOST_THREAD_RV(V) V
@@ -96,10 +102,10 @@ namespace boost
 #define BOOST_THREAD_DCL_MOVABLE_BEG(T) \
   namespace detail { \
     template <typename T> \
-    struct has_move_emulation_enabled_aux_dummy_specialization<
+    struct enable_move_utility_emulation_dummy_specialization<
 
 #define BOOST_THREAD_DCL_MOVABLE_END > \
-      : integral_constant<bool, true> \
+      : integral_constant<bool, false> \
       {}; \
     }
 
@@ -107,6 +113,7 @@ namespace boost
 
 #if defined BOOST_THREAD_USES_MOVE
 #define BOOST_THREAD_RV_REF(TYPE) BOOST_RV_REF(TYPE)
+#define BOOST_THREAD_RV_REF_2_TEMPL_ARGS(TYPE) BOOST_RV_REF_2_TEMPL_ARGS(TYPE)
 #define BOOST_THREAD_RV_REF_BEG BOOST_RV_REF_BEG
 #define BOOST_THREAD_RV_REF_END BOOST_RV_REF_END
 #define BOOST_THREAD_RV(V) V
@@ -115,10 +122,10 @@ namespace boost
 #define BOOST_THREAD_DCL_MOVABLE_BEG(T) \
   namespace detail { \
     template <typename T> \
-    struct has_move_emulation_enabled_aux_dummy_specialization<
+    struct enable_move_utility_emulation_dummy_specialization<
 
 #define BOOST_THREAD_DCL_MOVABLE_END > \
-      : integral_constant<bool, true> \
+      : integral_constant<bool, false> \
       {}; \
     }
 
@@ -132,17 +139,19 @@ namespace boost
 
 #define BOOST_THREAD_DCL_MOVABLE(TYPE) \
 template <> \
-struct has_move_emulation_enabled_aux< TYPE > \
-  : BOOST_MOVE_BOOST_NS::integral_constant<bool, true> \
-{};
+struct enable_move_utility_emulation< TYPE > \
+{ \
+   static const bool value = false; \
+};
 
 #define BOOST_THREAD_DCL_MOVABLE_BEG(T) \
 template <typename T> \
-struct has_move_emulation_enabled_aux<
+struct enable_move_utility_emulation<
 
 #define BOOST_THREAD_DCL_MOVABLE_END > \
-  : BOOST_MOVE_BOOST_NS::integral_constant<bool, true> \
-{};
+{ \
+   static const bool value = false; \
+};
 
 #endif
 
@@ -227,19 +236,26 @@ namespace detail
 
 
 
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
 namespace boost
 {  namespace thread_detail
   {
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
       template <class T>
       typename decay<T>::type
       decay_copy(T&& t)
       {
           return boost::forward<T>(t);
       }
+#else
+  template <class T>
+  typename decay<T>::type
+  decay_copy(BOOST_THREAD_FWD_REF(T) t)
+  {
+      return boost::forward<T>(t);
   }
-}
 #endif
+  }
+}
 
 #include <boost/config/abi_suffix.hpp>