[Boost-commit] svn:boost r80964 - in branches/release: boost/chrono/detail boost/chrono/io boost/chrono/io_v1 libs/chrono/build libs/chrono/doc libs/chrono/src libs/chrono/test libs/chrono/test/duration libs/chrono/test/io libs/chrono/test/time_point libs/chrono/test/traits

Subject: [Boost-commit] svn:boost r80964 - in branches/release: boost/chrono/detail boost/chrono/io boost/chrono/io_v1 libs/chrono/build libs/chrono/doc libs/chrono/src libs/chrono/test libs/chrono/test/duration libs/chrono/test/io libs/chrono/test/time_point libs/chrono/test/traits
From: vicente.botet_at_[hidden]
Date: 2012-10-11 18:50:37

Author: viboes
Date: 2012-10-11 18:50:34 EDT (Thu, 11 Oct 2012)
New Revision: 80964
URL: http://svn.boost.org/trac/boost/changeset/80964

Log:
Chrono: Merge 80949,80950,80956
Properties modified: 
   branches/release/boost/chrono/detail/   (props changed)
   branches/release/boost/chrono/io/   (props changed)
   branches/release/boost/chrono/io_v1/   (props changed)
   branches/release/libs/chrono/src/   (props changed)
   branches/release/libs/chrono/test/duration/   (props changed)
   branches/release/libs/chrono/test/io/   (props changed)
   branches/release/libs/chrono/test/time_point/   (props changed)
   branches/release/libs/chrono/test/traits/   (props changed)
Text files modified: 
   branches/release/boost/chrono/io/duration_io.hpp   |     4 ++--                                    
   branches/release/boost/chrono/io/time_point_io.hpp |     8 ++++----                                
   branches/release/libs/chrono/build/Jamfile.v2      |    13 ++++++++++++-                           
   branches/release/libs/chrono/doc/chrono.qbk        |     3 ++-                                     
   branches/release/libs/chrono/test/Jamfile.v2       |    11 ++++++++++-                             
   5 files changed, 30 insertions(+), 9 deletions(-)

Modified: branches/release/boost/chrono/io/duration_io.hpp
==============================================================================
--- branches/release/boost/chrono/io/duration_io.hpp	(original)
+++ branches/release/boost/chrono/io/duration_io.hpp	2012-10-11 18:50:34 EDT (Thu, 11 Oct 2012)
@@ -130,7 +130,7 @@
 #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 @@
 #endif
       {
         typename std::basic_istream<CharT, Traits>::sentry ipfx(is);
-        if (ipfx)
+        if (bool(ipfx))
         {
           if (!std::has_facet<duration_get<CharT> >(is.getloc()))
           {

Modified: branches/release/boost/chrono/io/time_point_io.hpp
==============================================================================
--- branches/release/boost/chrono/io/time_point_io.hpp	(original)
+++ branches/release/boost/chrono/io/time_point_io.hpp	2012-10-11 18:50:34 EDT (Thu, 11 Oct 2012)
@@ -233,7 +233,7 @@
 #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 @@
       {
         //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 @@
     {
       //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 @@
     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

Modified: branches/release/libs/chrono/build/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/build/Jamfile.v2	(original)
+++ branches/release/libs/chrono/build/Jamfile.v2	2012-10-11 18:50:34 EDT (Thu, 11 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: branches/release/libs/chrono/doc/chrono.qbk
==============================================================================
--- branches/release/libs/chrono/doc/chrono.qbk	(original)
+++ branches/release/libs/chrono/doc/chrono.qbk	2012-10-11 18:50:34 EDT (Thu, 11 Oct 2012)
@@ -7274,7 +7274,8 @@
 
 * [@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.

Modified: branches/release/libs/chrono/test/Jamfile.v2
==============================================================================
--- branches/release/libs/chrono/test/Jamfile.v2	(original)
+++ branches/release/libs/chrono/test/Jamfile.v2	2012-10-11 18:50:34 EDT (Thu, 11 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 )