susumu.yata
null+****@clear*****
Thu Feb 28 14:01:05 JST 2013
susumu.yata 2013-02-28 14:01:05 +0900 (Thu, 28 Feb 2013) New Revision: 6888dea9618288d101350f5de158952122635c24 https://github.com/groonga/grnxx/commit/6888dea9618288d101350f5de158952122635c24 Log: Move implementations of grnxx::Systeam/SteadyClock to *.cpp. Copied files: lib/steady_clock.cpp (from lib/steady_clock.hpp) lib/system_clock.cpp (from lib/steady_clock.hpp) Modified files: lib/Makefile.am lib/steady_clock.hpp lib/system_clock.hpp Modified: lib/Makefile.am (+2 -0) =================================================================== --- lib/Makefile.am 2013-02-28 13:40:08 +0900 (477ff28) +++ lib/Makefile.am 2013-02-28 14:01:05 +0900 (82a743c) @@ -22,8 +22,10 @@ libgrnxx_la_SOURCES = \ os.cpp \ recycler.cpp \ slice.cpp \ + steady_clock.cpp \ string.cpp \ string_builder.cpp \ + system_clock.cpp \ thread.cpp \ time.cpp Copied: lib/steady_clock.cpp (+5 -14) 70% =================================================================== --- lib/steady_clock.hpp 2013-02-28 13:40:08 +0900 (0424a87) +++ lib/steady_clock.cpp 2013-02-28 14:01:05 +0900 (935e500) @@ -15,24 +15,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRNXX_STEADY_CLOCK_HPP -#define GRNXX_STEADY_CLOCK_HPP - -#include "basic.hpp" -#include "time.hpp" +#include "steady_clock.hpp" #include <chrono> namespace grnxx { -class SteadyClock { - public: - static Time now() { - return Time(std::chrono::duration_cast<std::chrono::microseconds>( - std::chrono::steady_clock::now().time_since_epoch()).count()); - } -}; +Time SteadyClock::now() { + return Time(std::chrono::duration_cast<std::chrono::microseconds>( + std::chrono::steady_clock::now().time_since_epoch()).count()); +} } // namespace grnxx - -#endif // GRNXX_STEADY_CLOCK_HPP Modified: lib/steady_clock.hpp (+1 -6) =================================================================== --- lib/steady_clock.hpp 2013-02-28 13:40:08 +0900 (0424a87) +++ lib/steady_clock.hpp 2013-02-28 14:01:05 +0900 (60cf1b2) @@ -21,16 +21,11 @@ #include "basic.hpp" #include "time.hpp" -#include <chrono> - namespace grnxx { class SteadyClock { public: - static Time now() { - return Time(std::chrono::duration_cast<std::chrono::microseconds>( - std::chrono::steady_clock::now().time_since_epoch()).count()); - } + static Time now(); }; } // namespace grnxx Copied: lib/system_clock.cpp (+5 -14) 70% =================================================================== --- lib/steady_clock.hpp 2013-02-28 13:40:08 +0900 (0424a87) +++ lib/system_clock.cpp 2013-02-28 14:01:05 +0900 (d637dec) @@ -15,24 +15,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRNXX_STEADY_CLOCK_HPP -#define GRNXX_STEADY_CLOCK_HPP - -#include "basic.hpp" -#include "time.hpp" +#include "system_clock.hpp" #include <chrono> namespace grnxx { -class SteadyClock { - public: - static Time now() { - return Time(std::chrono::duration_cast<std::chrono::microseconds>( - std::chrono::steady_clock::now().time_since_epoch()).count()); - } -}; +Time SystemClock::now() { + return Time(std::chrono::duration_cast<std::chrono::microseconds>( + std::chrono::system_clock::now().time_since_epoch()).count()); +} } // namespace grnxx - -#endif // GRNXX_STEADY_CLOCK_HPP Modified: lib/system_clock.hpp (+1 -6) =================================================================== --- lib/system_clock.hpp 2013-02-28 13:40:08 +0900 (048ec2b) +++ lib/system_clock.hpp 2013-02-28 14:01:05 +0900 (d1b6111) @@ -21,16 +21,11 @@ #include "basic.hpp" #include "time.hpp" -#include <chrono> - namespace grnxx { class SystemClock { public: - static Time now() { - return Time(std::chrono::duration_cast<std::chrono::microseconds>( - std::chrono::system_clock::now().time_since_epoch()).count()); - } + static Time now(); }; } // namespace grnxx -------------- next part -------------- HTML����������������������������...Download