Skip to content

Bugfix duplicate symbol error in time_measure.hpp #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spreadsort merged 3 commits into from
Nov 7, 2022
Merged

Bugfix duplicate symbol error in time_measure.hpp #63

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bec9266
Bugfix duplicate symbol error in time_measure.hpp
marksantaniello Aug 16, 2022
df83d0e
Bugfix duplicate symbol error in time_measure.hpp
marksantaniello Aug 16, 2022
8efbe15
Merge branch 'develop' of github.com:marksantaniello/sort into develop
marksantaniello Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/boost/sort/common/time_measure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ double subtract_time ( const time_point & t1, const time_point & t2 );
/// @brief return the time system in a internal format ( steady_clock)
/// @return time in steady_clock format
//---------------------------------------------------------------------------
time_point now ( ) { return chrn::steady_clock::now( ); };
inline time_point now ( ) { return chrn::steady_clock::now( ); };
//
//---------------------------------------------------------------------------
// function : subtract_time
Expand All @@ -48,7 +48,7 @@ time_point now ( ) { return chrn::steady_clock::now( ); };
/// @param [in] t2 : second time in time_point format
/// @return time in seconds of the difference of t1 - t2
//---------------------------------------------------------------------------
double subtract_time ( const time_point & t1, const time_point & t2 )
inline double subtract_time ( const time_point & t1, const time_point & t2 )
{ //------------------------ begin ---------------------------------
chrn::duration<double> time_span =
chrn::duration_cast < chrn::duration < double > > ( t1 - t2 );
Expand Down