Subject: [Boost-commit] svn:boost r80949 - in trunk: boost/chrono/io libs/chrono/build libs/chrono/test
From: vicente.botet_at_[hidden]
Date: 2012-10-10 19:05:03
Author: viboes
Date: 2012-10-10 19:05:02 EDT (Wed, 10 Oct 2012)
New Revision: 80949
URL: http://svn.boost.org/trac/boost/changeset/80949
Log:
Chrono: Added some warning removal on intel and fix explicit bool conversion issue
Text files modified:
trunk/boost/chrono/io/duration_io.hpp | 2 +-
trunk/boost/chrono/io/time_point_io.hpp | 8 ++++----
trunk/libs/chrono/build/Jamfile.v2 | 13 ++++++++++++-
trunk/libs/chrono/test/Jamfile.v2 | 11 ++++++++++-
4 files changed, 27 insertions(+), 7 deletions(-)
Modified: trunk/boost/chrono/io/duration_io.hpp
==============================================================================
--- trunk/boost/chrono/io/duration_io.hpp (original)
+++ trunk/boost/chrono/io/duration_io.hpp 2012-10-10 19:05:02 EDT (Wed, 10 Oct 2012)
@@ -127,7 +127,7 @@
BOOST_TRY
{
typename std::basic_ostream<CharT, Traits>::sentry opfx(os);
- if (opfx)
+ if (bool(opfx))
{
if (!std::has_facet<duration_put<CharT> >(os.getloc()))
{
Modified: trunk/boost/chrono/io/time_point_io.hpp
==============================================================================
--- trunk/boost/chrono/io/time_point_io.hpp (original)
+++ trunk/boost/chrono/io/time_point_io.hpp 2012-10-10 19:05:02 EDT (Wed, 10 Oct 2012)
@@ -230,7 +230,7 @@
BOOST_TRY
{
typename std::basic_ostream<CharT, Traits>::sentry opfx(os);
- if (opfx)
+ if (bool(opfx))
{
if (!std::has_facet<time_point_put<CharT> >(os.getloc()))
{
@@ -287,7 +287,7 @@
{
//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()))
@@ -397,7 +397,7 @@
{
//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;
@@ -585,7 +585,7 @@
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;
BOOST_TRY
Modified: trunk/libs/chrono/build/Jamfile.v2
==============================================================================
--- trunk/libs/chrono/build/Jamfile.v2 (original)
+++ trunk/libs/chrono/build/Jamfile.v2 2012-10-10 19:05:02 EDT (Wed, 10 Oct 2012)
@@ -53,10 +53,21 @@
<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
Modified: trunk/libs/chrono/test/Jamfile.v2
==============================================================================
--- trunk/libs/chrono/test/Jamfile.v2 (original)
+++ trunk/libs/chrono/test/Jamfile.v2 2012-10-10 19:05:02 EDT (Wed, 10 Oct 2012)
@@ -41,10 +41,19 @@
<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 )