boost_mirror/chrono
1
0
Fork 0
mirror of https://github.com/boostorg/chrono.git synced 2025-05-08 02:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chrono: Merge 80949,80950,80956

Browse Source 
[SVN r80964]
This commit is contained in:
Vicente J. Botet Escriba 2012-10-11 22:50:34 +00:00
parent bd19b46c63
commit 6d6a0f352c
5 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/Jamfile.v2
View File

@ -53,10 +53,21 @@ project boost/chrono
<toolset>gcc-mingw-4.7.0:<cxxflags>-fdiagnostics-show-option
<toolset>gcc-mingw-4.8.0:<cxxflags>-fdiagnostics-show-option
# Note: Some of the remarks from the Intel compiler are disabled
# remark #193: zero used for undefined preprocessing identifier "XXX"
# remark #304: access control not specified ("public" by default)
# remark #383: value copied to temporary, reference to temporary used
# remark #444: destructor for base class "XXX" (declared at line YYY") is not virtual
# remark #593: variable "XXX" was set but never used
# remark #981: operands are evaluated in unspecified order
# remark #1418: external function definition with no prior declaration
<toolset>intel:<cxxflags>-wd304,383,1418
# remark #2415: variable "XXX" of static storage duration was declared but never referenced
<toolset>intel:<cxxflags>-wd193,304,383,444
<toolset>intel:<cxxflags>-wd593,981
<toolset>intel:<cxxflags>-wd1418
<toolset>intel:<cxxflags>-wd2415
: usage-requirements # pass these requirement to dependents (i.e. users)
<threading>single:<define>BOOST_CHRONO_THREAD_DISABLED

3
doc/chrono.qbk
View File

@ -7274,7 +7274,8 @@ When BOOST_CHRONO_VERSION==2 the preceding deprecated functions are not availabl
* [@http://svn.boost.org/trac/boost/ticket/7381 #7381] C++11 compliance: unresolved symbol when assigning a constexpr duration to a non-const local variable.
* [@http://svn.boost.org/trac/boost/ticket/7479 #7479] Compiles fails with compilers supporting constexpr fails if the standard library doesn't provides the constexpr interface
* [@http://svn.boost.org/trac/boost/ticket/7493 #7493] compile fail on intel-linux-12.1.3.0x because of bug on explicit bool conversion
[*Would not fix:]
* [@http://svn.boost.org/trac/boost/ticket/6871 #6871] chrono_io.hpp: operator<<(ostream& os, ...) modifies the state of os.

4
include/boost/chrono/io/duration_io.hpp
View File

@ -130,7 +130,7 @@ namespace boost
#endif
{
typename std::basic_ostream<CharT, Traits>::sentry opfx(os);
if (opfx)
if (bool(opfx))
{
if (!std::has_facet<duration_put<CharT> >(os.getloc()))
{
@ -191,7 +191,7 @@ namespace boost
#endif
{
typename std::basic_istream<CharT, Traits>::sentry ipfx(is);
if (ipfx)
if (bool(ipfx))
{
if (!std::has_facet<duration_get<CharT> >(is.getloc()))
{

8
include/boost/chrono/io/time_point_io.hpp
View File

@ -233,7 +233,7 @@ namespace boost
#endif
{
typename std::basic_ostream<CharT, Traits>::sentry opfx(os);
if (opfx)
if (bool(opfx))
{
if (!std::has_facet<time_point_put<CharT> >(os.getloc()))
{
@ -293,7 +293,7 @@ namespace boost
{
//std::cerr << __FILE__ << "[" << __LINE__ << "]"<< std::endl;
typename std::basic_istream<CharT, Traits>::sentry ipfx(is);
if (ipfx)
if (bool(ipfx))
{
//std::cerr << __FILE__ << "[" << __LINE__ << "]"<< std::endl;
if (!std::has_facet<time_point_get<CharT> >(is.getloc()))
@ -403,7 +403,7 @@ namespace boost
{
//std::cerr << __FILE__ << "[" << __LINE__ << "]"<< std::endl;
typename std::basic_ostream<CharT, Traits>::sentry ok(os);
if (ok)
if (bool(ok))
{
//std::cerr << __FILE__ << "[" << __LINE__ << "]"<< std::endl;
bool failed = false;
@ -594,7 +594,7 @@ namespace boost
operator>>(std::basic_istream<CharT, Traits>& is, time_point<system_clock, Duration>& tp)
{
typename std::basic_istream<CharT, Traits>::sentry ok(is);
if (ok)
if (bool(ok))
{
std::ios_base::iostate err = std::ios_base::goodbit;
#ifndef BOOST_NO_EXCEPTIONS

11
test/Jamfile.v2
View File

@ -41,10 +41,19 @@ project
<toolset>gcc-mingw-4.5.0:<cxxflags>-fdiagnostics-show-option
<toolset>msvc:<cxxflags>/wd4127
# Note: Some of the remarks from the Intel compiler are disabled
# remark #193: zero used for undefined preprocessing identifier "XXX"
# remark #304: access control not specified ("public" by default)
# remark #383: value copied to temporary, reference to temporary used
# remark #444: destructor for base class "XXX" (declared at line YYY") is not virtual
# remark #593: variable "XXX" was set but never used
# remark #981: operands are evaluated in unspecified order
# remark #1418: external function definition with no prior declaration
<toolset>intel:<cxxflags>-wd304,383,1418
# remark #2415: variable "XXX" of static storage duration was declared but never referenced
<toolset>intel:<cxxflags>-wd193,304,383,444
<toolset>intel:<cxxflags>-wd593,981
<toolset>intel:<cxxflags>-wd1418
<toolset>intel:<cxxflags>-wd2415
;
rule chrono-run ( sources )