diff --git INDEX:/boost/test/data/monomorphic/dataset.hpp WORKDIR:/boost/test/data/monomorphic/dataset.hpp index e33d754..7d18bd5 100755 --- INDEX:/boost/test/data/monomorphic/dataset.hpp +++ WORKDIR:/boost/test/data/monomorphic/dataset.hpp @@ -22,7 +22,8 @@ // STL #include #include -#include +#include +#include #include @@ -54,9 +55,9 @@ struct traits { // !! ?? reimplement using variadics template -struct traits> { +struct traits > { // type of the reference to sample returned by iterator - typedef std::tuple ref_type; + typedef std::tr1::tuple ref_type; template static void @@ -69,9 +70,9 @@ struct traits> { //____________________________________________________________________________// template -struct traits> { +struct traits > { // type of the reference to sample returned by iterator - typedef std::tuple ref_type; + typedef std::tr1::tuple ref_type; template static void @@ -105,7 +106,7 @@ public: virtual void operator++() = 0; }; - typedef std::shared_ptr iter_ptr; + typedef std::tr1::shared_ptr iter_ptr; // dataset size virtual data::size_t size() const = 0; @@ -118,7 +119,7 @@ public: // ************************************************************************** // template -struct is_dataset : std::false_type {}; +struct is_dataset : std::tr1::false_type {}; //____________________________________________________________________________// @@ -139,7 +140,7 @@ struct is_dataset : is_dataset {}; // ************************************************************************** // template -inline typename std::enable_if::value,DS>::type +inline typename std::tr1::enable_if::value,DS>::type make(DS&& ds) { return std::move( ds ); diff --git INDEX:/boost/test/utils/named_params.hpp WORKDIR:/boost/test/utils/named_params.hpp index aac75cc..08797c8 100644 --- INDEX:/boost/test/utils/named_params.hpp +++ WORKDIR:/boost/test/utils/named_params.hpp @@ -27,6 +27,8 @@ #include +#include + //____________________________________________________________________________// namespace boost { @@ -346,14 +348,14 @@ struct param_type,Keyword,DefaultTy template struct param_type,keyword,DefaultType> { - typedef typename std::remove_cv::type type; + typedef typename std::tr1::remove_cv::type type; }; template struct param_type,Rest>, keyword, DefaultType> { - typedef typename std::remove_cv::type type; + typedef typename std::tr1::remove_cv::type type; }; } // namespace nfp