Repository: mesos Updated Branches: refs/heads/master 8fd1e3d16 -> 72548a736
Remove non-variadic strings::format() implementation. Variadic templates are supported by all our compilers and are already relied on by stout (<tuple>, <tr1/tuple>). Review: https://reviews.apache.org/r/26147 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/72548a73 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/72548a73 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/72548a73 Branch: refs/heads/master Commit: 72548a7367a8921d51395cd84bbedd4728eff244 Parents: 8fd1e3d Author: Cody Maloney <[email protected]> Authored: Thu Mar 26 09:10:49 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Thu Mar 26 09:10:50 2015 -0700 ---------------------------------------------------------------------- .../3rdparty/stout/include/stout/format.hpp | 318 ------------------- 1 file changed, 318 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/72548a73/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp index 58ab742..e0b60fe 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp @@ -54,7 +54,6 @@ struct stringify; } // namespace internal { -#if __cplusplus >= 201103L template <typename ...T> Try<std::string> format(const std::string& s, const T& ...t) { @@ -62,323 +61,6 @@ Try<std::string> format(const std::string& s, const T& ...t) s, internal::stringify<T, !std::is_pod<T>::value>(t).get()...); } -#else -template <typename T1> -Try<std::string> format(const std::string& s, - const T1& t1) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get()); -} - - -template <typename T1, - typename T2> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T1>::value>(t2).get()); -} - - -template <typename T1, - typename T2, - typename T3> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7, - const T8& t8) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get(), - internal::stringify<T8, !std::tr1::is_pod<T8>::value>(t8).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7, - const T8& t8, - const T9& t9) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get(), - internal::stringify<T8, !std::tr1::is_pod<T8>::value>(t8).get(), - internal::stringify<T9, !std::tr1::is_pod<T9>::value>(t9).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7, - const T8& t8, - const T9& t9, - const T10& t10) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get(), - internal::stringify<T8, !std::tr1::is_pod<T8>::value>(t8).get(), - internal::stringify<T9, !std::tr1::is_pod<T9>::value>(t9).get(), - internal::stringify<T10, !std::tr1::is_pod<T10>::value>(t10).get()); -} - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, - typename T11> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7, - const T8& t8, - const T9& t9, - const T10& t10, - const T11& t11) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get(), - internal::stringify<T8, !std::tr1::is_pod<T8>::value>(t8).get(), - internal::stringify<T9, !std::tr1::is_pod<T9>::value>(t9).get(), - internal::stringify<T10, !std::tr1::is_pod<T10>::value>(t10).get(), - internal::stringify<T11, !std::tr1::is_pod<T11>::value>(t11).get()); -} - - -template <typename T1, - typename T2, - typename T3, - typename T4, - typename T5, - typename T6, - typename T7, - typename T8, - typename T9, - typename T10, - typename T11, - typename T12> -Try<std::string> format(const std::string& s, - const T1& t1, - const T2& t2, - const T3& t3, - const T4& t4, - const T5& t5, - const T6& t6, - const T7& t7, - const T8& t8, - const T9& t9, - const T10& t10, - const T11& t11, - const T12& t12) -{ - return internal::format( - s, - internal::stringify<T1, !std::tr1::is_pod<T1>::value>(t1).get(), - internal::stringify<T2, !std::tr1::is_pod<T2>::value>(t2).get(), - internal::stringify<T3, !std::tr1::is_pod<T3>::value>(t3).get(), - internal::stringify<T4, !std::tr1::is_pod<T4>::value>(t4).get(), - internal::stringify<T5, !std::tr1::is_pod<T5>::value>(t5).get(), - internal::stringify<T6, !std::tr1::is_pod<T6>::value>(t6).get(), - internal::stringify<T7, !std::tr1::is_pod<T7>::value>(t7).get(), - internal::stringify<T8, !std::tr1::is_pod<T8>::value>(t8).get(), - internal::stringify<T9, !std::tr1::is_pod<T9>::value>(t9).get(), - internal::stringify<T10, !std::tr1::is_pod<T10>::value>(t10).get(), - internal::stringify<T11, !std::tr1::is_pod<T11>::value>(t11).get(), - internal::stringify<T12, !std::tr1::is_pod<T12>::value>(t12).get()); -} -#endif // __cplusplus >= 201103L namespace internal {
