Ticket #7546: 7546_7547_disabler.patch
File 7546_7547_disabler.patch, 3.9 KB (added by , 10 years ago) |
---|
-
boost/chrono/config.hpp
25 25 #define BOOST_USE_WINDOWS_H 26 26 #endif 27 27 28 #if ! defined BOOST_CHRONO_PROVIDES_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT \ 29 && ! defined BOOST_CHRONO_DONT_PROVIDE_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 30 31 # define BOOST_CHRONO_DONT_PROVIDE_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 32 33 #endif 34 28 35 // BOOST_CHRONO_POSIX_API, BOOST_CHRONO_MAC_API, or BOOST_CHRONO_WINDOWS_API 29 36 // can be defined by the user to specify which API should be used 30 37 -
boost/chrono/io/time_point_io.hpp
708 708 #endif 709 709 } // detail 710 710 711 #if defined BOOST_CHRONO_PROVIDES_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 711 712 template <class CharT, class Traits, class Duration> 712 713 std::basic_ostream<CharT, Traits>& 713 714 operator<<(std::basic_ostream<CharT, Traits>& os, const time_point<system_clock, Duration>& tp) … … 838 839 //std::cerr << __FILE__ << "[" << __LINE__ << "]"<< std::endl; 839 840 return os; 840 841 } 842 #endif 841 843 842 844 namespace detail 843 845 { … … 901 903 902 904 } // detail 903 905 906 #if defined BOOST_CHRONO_PROVIDES_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 904 907 template <class CharT, class Traits, class Duration> 905 908 std::basic_istream<CharT, Traits>& 906 909 operator>>(std::basic_istream<CharT, Traits>& is, time_point<system_clock, Duration>& tp) … … 1034 1037 } 1035 1038 return is; 1036 1039 } 1040 #endif 1037 1041 #endif //UTC 1038 1042 } // chrono 1039 1043 -
libs/chrono/test/io/time_point_input.cpp
147 147 check_all<boost::chrono::steady_clock> (); 148 148 #endif 149 149 std::cout << "system_clock=" << std::endl; 150 #if BOOST_CHRONO_VERSION >= 2 150 #if BOOST_CHRONO_VERSION >= 2 && defined BOOST_CHRONO_PROVIDES_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 151 151 check_all_system_clock(); 152 152 #else 153 153 check_all<boost::chrono::system_clock> (); -
libs/chrono/test/io/time_point_output.cpp
41 41 { 42 42 std::ostringstream out; 43 43 boost::chrono::time_point<Clock, D> tp(d); 44 #if BOOST_CHRONO_VERSION ==244 #if BOOST_CHRONO_VERSION>=2 45 45 out << boost::chrono::duration_fmt(boost::chrono::duration_style::symbol) << tp; 46 46 #else 47 47 out << boost::chrono::duration_short << tp; … … 96 96 using namespace boost::chrono; 97 97 using namespace boost; 98 98 99 #if BOOST_CHRONO_VERSION ==299 #if BOOST_CHRONO_VERSION>=2 100 100 test_good<Clock>("2 hours", hours(2), duration_style::prefix); 101 101 test_good<Clock>("2 h", hours(2), duration_style::symbol); 102 102 #endif … … 114 114 test_good_prefix<Clock> ("2 [1/30]seconds", duration<boost::int_least64_t, ratio<1, 30> > (2)); 115 115 116 116 test_good_symbol<Clock> ("2 h", hours(2)); 117 #if BOOST_CHRONO_VERSION ==2117 #if BOOST_CHRONO_VERSION>=2 118 118 test_good_symbol<Clock>("2 min", minutes(2)); 119 119 #else 120 120 test_good_symbol<Clock> ("2 m", minutes(2)); … … 126 126 test_good_symbol<Clock> ("2 [1/30]s", duration<boost::int_least64_t, ratio<1, 30> > (2)); 127 127 } 128 128 129 #if BOOST_CHRONO_VERSION ==2129 #if BOOST_CHRONO_VERSION >= 2 130 130 void check_all_system_clock() 131 131 { 132 132 using namespace boost::chrono; … … 166 166 check_all<boost::chrono::steady_clock> (); 167 167 #endif 168 168 std::cout << "system_clock=" << std::endl; 169 #if BOOST_CHRONO_VERSION ==2169 #if BOOST_CHRONO_VERSION >= 2 && defined BOOST_CHRONO_PROVIDES_DATE_IO_FOR_SYSTEM_CLOCK_TIME_POINT 170 170 check_all_system_clock(); 171 171 #else 172 172 check_all<boost::chrono::system_clock> ();