[Boost-commit] svn:boost r67779 - trunk/boost/chrono/detail/inlined/mac

Subject: [Boost-commit] svn:boost r67779 - trunk/boost/chrono/detail/inlined/mac
From: vicente.botet_at_[hidden]
Date: 2011-01-08 09:31:13

Author: viboes
Date: 2011-01-08 09:31:10 EST (Sat, 08 Jan 2011)
New Revision: 67779
URL: http://svn.boost.org/trac/boost/changeset/67779

Log:
Boost.Chrono: Try to solve function pointer issue

 Test output:
Rev 67766 / Sat, 8 Jan 2011 01:49:47 +0000
Report Time: Sat, 8 Jan 2011 12:49:04 +0000

Compile [2011-01-08 02:36:12 UTC]: fail

    "/usr/bin/g++"  -ftemplate-depth-128 -O0 -fno-inline -Wall -pedantic -g -dynamic -no-cpp-precomp -gdwarf-2 -Wno-long-double -fPIC -Wextra -Wno-long-long -pedantic -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DBOOST_SYSTEM_DYN_LINK=1 -DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_USE_WINDOWS_H  -I".." -c -o "/Volumes/Scratch/kbelco/boost/results/boost/bin.v2/libs/chrono/build/darwin-4.0.1/debug/chrono.o" "../libs/chrono/src/chrono.cpp"

../boost/chrono/detail/inlined/mac/chrono.hpp: In static member function 'static boost::chrono::time_point<boost::chrono::steady_clock, boost::chrono::nanoseconds> boost::chrono::steady_clock::now()':
../boost/chrono/detail/inlined/mac/chrono.hpp:197: error: invalid conversion from 'int_least64_t (*)()' to 'int_least64_t (*)(boost::system::error_code&)'
../boost/chrono/detail/inlined/mac/chrono.hpp:206: error: too few arguments to function
../boost/chrono/detail/inlined/mac/chrono.hpp: In static member function 'static boost::chrono::time_point<boost::chrono::steady_clock, boost::chrono::nanoseconds> boost::chrono::steady_clock::now(boost::system::error_code&)':
../boost/chrono/detail/inlined/mac/chrono.hpp:213: error: invalid conversion from 'int_least64_t (*)()' to 'int_least64_t (*)(boost::system::error_code&)'
../boost/chrono/detail/inlined/mac/chrono.hpp: At global scope:
../boost/chrono/detail/inlined/mac/chrono.hpp:176: warning: 'int_least64_t (* boost::chrono::chrono_detail::init_steady_clock_ec(kern_return_t&))(boost::system::error_code&)' defined but not used

TinyUrl 

Text files modified: 
   trunk/boost/chrono/detail/inlined/mac/chrono.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/chrono/detail/inlined/mac/chrono.hpp
==============================================================================
--- trunk/boost/chrono/detail/inlined/mac/chrono.hpp	(original)
+++ trunk/boost/chrono/detail/inlined/mac/chrono.hpp	2011-01-08 09:31:10 EST (Sat, 08 Jan 2011)
@@ -194,7 +194,7 @@
 steady_clock::now()
 {
     static kern_return_t err;
-    static chrono_detail::FP_ec fp = chrono_detail::init_steady_clock(err);
+    static chrono_detail::FP fp = chrono_detail::init_steady_clock(err);
     if ( err != 0  ) 
     {     
         boost::throw_exception(
@@ -210,7 +210,7 @@
 steady_clock::now(system::error_code & ec)
 {
     static kern_return_t err;
-    static chrono_detail::FP_ec fp = chrono_detail::init_steady_clock(err);
+    static chrono_detail::FP_ec fp = chrono_detail::init_steady_clock_ec(err);
     if ( err != 0  ) 
     {
         if (BOOST_CHRONO_IS_THROWS(ec))