susumu.yata
null+****@clear*****
Mon Mar 11 16:03:03 JST 2013
susumu.yata 2013-03-11 16:03:03 +0900 (Mon, 11 Mar 2013) New Revision: da54b664d93334bb33a701cb4e28dbf24341cc9d https://github.com/groonga/grnxx/commit/da54b664d93334bb33a701cb4e28dbf24341cc9d Message: Move time-related source files into time/. Added files: lib/time/Makefile.am Modified files: configure.ac lib/Makefile.am lib/io/file-posix.cpp lib/io/file-windows.cpp lib/io/file.hpp lib/io/file_info.hpp lib/io/pool-impl.cpp lib/io/view-posix.cpp lib/io/view-windows.cpp lib/logger.cpp lib/mutex.cpp lib/mutex.hpp lib/recycler.cpp lib/recycler.hpp lib/storage.hpp lib/thread.hpp test/test_alpha_double_array.cpp test/test_broken_down_time.cpp test/test_db_blob_vector.cpp test/test_db_vector.cpp test/test_duration.cpp test/test_internal_clock.cpp test/test_intrinsic.cpp test/test_io_pool.cpp test/test_map.cpp test/test_map_da_basic_trie.cpp test/test_map_da_large_trie.cpp test/test_map_double_array.cpp test/test_mutex.cpp test/test_recycler.cpp test/test_stopwatch.cpp test/test_string.cpp test/test_string_builder.cpp test/test_string_format.cpp test/test_thread.cpp test/test_time.cpp Renamed files: lib/time/broken_down_time.cpp (from lib/broken_down_time.cpp) lib/time/broken_down_time.hpp (from lib/broken_down_time.hpp) lib/time/duration.cpp (from lib/duration.cpp) lib/time/duration.hpp (from lib/duration.hpp) lib/time/internal_clock.cpp (from lib/internal_clock.cpp) lib/time/internal_clock.hpp (from lib/internal_clock.hpp) lib/time/stopwatch.cpp (from lib/stopwatch.cpp) lib/time/stopwatch.hpp (from lib/stopwatch.hpp) lib/time/system_clock.cpp (from lib/system_clock.cpp) lib/time/system_clock.hpp (from lib/system_clock.hpp) lib/time/time.cpp (from lib/time.cpp) lib/time/time.hpp (from lib/time.hpp) Modified: configure.ac (+1 -0) =================================================================== --- configure.ac 2013-03-11 13:08:43 +0900 (884be59) +++ configure.ac 2013-03-11 16:03:03 +0900 (8fdf603) @@ -64,6 +64,7 @@ AC_CONFIG_FILES([Makefile lib/io/Makefile lib/map/Makefile lib/map/da/Makefile + lib/time/Makefile src/Makefile test/Makefile]) AC_OUTPUT Modified: lib/Makefile.am (+4 -15) =================================================================== --- lib/Makefile.am 2013-03-11 13:08:43 +0900 (4e9f895) +++ lib/Makefile.am 2013-03-11 16:03:03 +0900 (d08d09b) @@ -1,4 +1,4 @@ -SUBDIRS = alpha db io map +SUBDIRS = alpha db io map time lib_LTLIBRARIES = libgrnxx.la @@ -6,43 +6,35 @@ libgrnxx_la_LIBADD = \ alpha/libgrnxx_alpha.la \ db/libgrnxx_db.la \ io/libgrnxx_io.la \ - map/libgrnxx_map.la + map/libgrnxx_map.la \ + time/libgrnxx_time.la libgrnxx_la_LDFLAGS = @AM_LTLDFLAGS@ libgrnxx_la_SOURCES = \ backtrace.cpp \ - broken_down_time.cpp \ - duration.cpp \ error.cpp \ grnxx.cpp \ - internal_clock.cpp \ logger.cpp \ map.cpp \ mutex.cpp \ os.cpp \ recycler.cpp \ slice.cpp \ - stopwatch.cpp \ storage.cpp \ string.cpp \ string_builder.cpp \ - system_clock.cpp \ - thread.cpp \ - time.cpp + thread.cpp libgrnxx_includedir = ${includedir}/grnxx libgrnxx_include_HEADERS = \ backtrace.hpp \ basic.hpp \ - broken_down_time.hpp \ - duration.hpp \ error.hpp \ exception.hpp \ features.hpp \ flags_impl.hpp \ grnxx.hpp \ - internal_clock.hpp \ intrinsic.hpp \ lock.hpp \ logger.hpp \ @@ -51,14 +43,11 @@ libgrnxx_include_HEADERS = \ os.hpp \ recycler.hpp \ slice.hpp \ - stopwatch.hpp \ storage.hpp \ string.hpp \ string_builder.hpp \ string_format.hpp \ - system_clock.hpp \ thread.hpp \ - time.hpp \ version.h EXTRA_DIST = version.sh Modified: lib/io/file-posix.cpp (+1 -1) =================================================================== --- lib/io/file-posix.cpp 2013-03-11 13:08:43 +0900 (a7eade1) +++ lib/io/file-posix.cpp 2013-03-11 16:03:03 +0900 (924cf75) @@ -31,8 +31,8 @@ #include "exception.hpp" #include "io/path.hpp" #include "logger.hpp" -#include "stopwatch.hpp" #include "thread.hpp" +#include "time/stopwatch.hpp" namespace grnxx { namespace io { Modified: lib/io/file-windows.cpp (+1 -1) =================================================================== --- lib/io/file-windows.cpp 2013-03-11 13:08:43 +0900 (f4230fb) +++ lib/io/file-windows.cpp 2013-03-11 16:03:03 +0900 (689801f) @@ -27,8 +27,8 @@ #include "exception.hpp" #include "io/path.hpp" #include "logger.hpp" -#include "stopwatch.hpp" #include "thread.hpp" +#include "time/stopwatch.hpp" namespace grnxx { namespace io { Modified: lib/io/file.hpp (+1 -1) =================================================================== --- lib/io/file.hpp 2013-03-11 13:08:43 +0900 (ee6e24a) +++ lib/io/file.hpp 2013-03-11 16:03:03 +0900 (2e7e778) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_HPP #define GRNXX_IO_FILE_HPP -#include "duration.hpp" +#include "time/duration.hpp" namespace grnxx { namespace io { Modified: lib/io/file_info.hpp (+1 -1) =================================================================== --- lib/io/file_info.hpp 2013-03-11 13:08:43 +0900 (15e4aab) +++ lib/io/file_info.hpp 2013-03-11 16:03:03 +0900 (1dbffd8) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_INFO_HPP #define GRNXX_IO_FILE_INFO_HPP -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { namespace io { Modified: lib/io/pool-impl.cpp (+1 -1) =================================================================== --- lib/io/pool-impl.cpp 2013-03-11 13:08:43 +0900 (4769f41) +++ lib/io/pool-impl.cpp 2013-03-11 16:03:03 +0900 (8ae3e1e) @@ -23,9 +23,9 @@ #include "io/path.hpp" #include "lock.hpp" #include "logger.hpp" -#include "stopwatch.hpp" #include "string_format.hpp" #include "thread.hpp" +#include "time/stopwatch.hpp" namespace grnxx { namespace io { Modified: lib/io/view-posix.cpp (+1 -1) =================================================================== --- lib/io/view-posix.cpp 2013-03-11 13:08:43 +0900 (35879a3) +++ lib/io/view-posix.cpp 2013-03-11 16:03:03 +0900 (e5b2670) @@ -24,8 +24,8 @@ #include "error.hpp" #include "exception.hpp" -#include "logger.hpp" #include "io/file.hpp" +#include "logger.hpp" #ifndef MAP_ANONYMOUS # ifdef MAP_ANON Modified: lib/io/view-windows.cpp (+1 -1) =================================================================== --- lib/io/view-windows.cpp 2013-03-11 13:08:43 +0900 (894e497) +++ lib/io/view-windows.cpp 2013-03-11 16:03:03 +0900 (a26bdf6) @@ -21,8 +21,8 @@ #include "error.hpp" #include "exception.hpp" -#include "logger.hpp" #include "io/file.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/logger.cpp (+1 -1) =================================================================== --- lib/logger.cpp 2013-03-11 13:08:43 +0900 (2c5c095) +++ lib/logger.cpp 2013-03-11 16:03:03 +0900 (0902f4f) @@ -23,7 +23,7 @@ #include "backtrace.hpp" #include "lock.hpp" -#include "system_clock.hpp" +#include "time/system_clock.hpp" namespace grnxx { Modified: lib/mutex.cpp (+1 -1) =================================================================== --- lib/mutex.cpp 2013-03-11 13:08:43 +0900 (3c79343) +++ lib/mutex.cpp 2013-03-11 16:03:03 +0900 (e10eed1) @@ -17,8 +17,8 @@ */ #include "mutex.hpp" -#include "stopwatch.hpp" #include "thread.hpp" +#include "time/stopwatch.hpp" namespace grnxx { Modified: lib/mutex.hpp (+1 -1) =================================================================== --- lib/mutex.hpp 2013-03-11 13:08:43 +0900 (56ec3bc) +++ lib/mutex.hpp 2013-03-11 16:03:03 +0900 (0e113f2) @@ -19,8 +19,8 @@ #define GRNXX_MUTEX_HPP #include "basic.hpp" -#include "duration.hpp" #include "intrinsic.hpp" +#include "time/duration.hpp" namespace grnxx { Modified: lib/recycler.cpp (+1 -1) =================================================================== --- lib/recycler.cpp 2013-03-11 13:08:43 +0900 (282237a) +++ lib/recycler.cpp 2013-03-11 16:03:03 +0900 (9959b85) @@ -17,7 +17,7 @@ */ #include "recycler.hpp" -#include "system_clock.hpp" +#include "time/system_clock.hpp" namespace grnxx { Modified: lib/recycler.hpp (+1 -1) =================================================================== --- lib/recycler.hpp 2013-03-11 13:08:43 +0900 (9ca229d) +++ lib/recycler.hpp 2013-03-11 16:03:03 +0900 (d14da6d) @@ -18,7 +18,7 @@ #ifndef GRNXX_RECYCLER_HPP #define GRNXX_RECYCLER_HPP -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { Modified: lib/storage.hpp (+1 -1) =================================================================== --- lib/storage.hpp 2013-03-11 13:08:43 +0900 (d4fb4f1) +++ lib/storage.hpp 2013-03-11 16:03:03 +0900 (2fe61cd) @@ -19,7 +19,7 @@ #define GRNXX_STORAGE_HPP #include "basic.hpp" -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { Modified: lib/thread.hpp (+1 -1) =================================================================== --- lib/thread.hpp 2013-03-11 13:08:43 +0900 (6b06650) +++ lib/thread.hpp 2013-03-11 16:03:03 +0900 (c860998) @@ -19,7 +19,7 @@ #define GRNXX_THREAD_HPP #include "basic.hpp" -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { Added: lib/time/Makefile.am (+20 -0) 100644 =================================================================== --- /dev/null +++ lib/time/Makefile.am 2013-03-11 16:03:03 +0900 (88add27) @@ -0,0 +1,20 @@ +noinst_LTLIBRARIES = libgrnxx_time.la + +libgrnxx_time_la_LDFLAGS = @AM_LTLDFLAGS@ + +libgrnxx_time_la_SOURCES = \ + broken_down_time.cpp \ + duration.cpp \ + internal_clock.cpp \ + stopwatch.cpp \ + system_clock.cpp \ + time.cpp + +libgrnxx_time_includedir = ${includedir}/grnxx/time +libgrnxx_time_include_HEADERS = \ + broken_down_time.hpp \ + duration.hpp \ + internal_clock.hpp \ + stopwatch.hpp \ + system_clock.hpp \ + time.hpp Renamed: lib/time/broken_down_time.cpp (+1 -1) 97% =================================================================== --- lib/broken_down_time.cpp 2013-03-11 13:08:43 +0900 (a5c4fa2) +++ lib/time/broken_down_time.cpp 2013-03-11 16:03:03 +0900 (cf2eaf6) @@ -15,7 +15,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "broken_down_time.hpp" +#include "time/broken_down_time.hpp" #include <iostream> Renamed: lib/time/broken_down_time.hpp (+3 -3) 92% =================================================================== --- lib/broken_down_time.hpp 2013-03-11 13:08:43 +0900 (34dd118) +++ lib/time/broken_down_time.hpp 2013-03-11 16:03:03 +0900 (8c88d67) @@ -15,8 +15,8 @@ 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_BROKEN_DOWN_TIME_HPP -#define GRNXX_BROKEN_DOWN_TIME_HPP +#ifndef GRNXX_TIME_BROKEN_DOWN_TIME_HPP +#define GRNXX_TIME_BROKEN_DOWN_TIME_HPP #include "basic.hpp" #include "string_builder.hpp" @@ -51,4 +51,4 @@ std::ostream &operator<<(std::ostream &stream, const BrokenDownTime &time); } // namespace grnxx -#endif // GRNXX_BROKEN_DOWN_TIME_HPP +#endif // GRNXX_TIME_BROKEN_DOWN_TIME_HPP Renamed: lib/time/duration.cpp (+1 -1) 98% =================================================================== --- lib/duration.cpp 2013-03-11 13:08:43 +0900 (c4402e1) +++ lib/time/duration.cpp 2013-03-11 16:03:03 +0900 (073da33) @@ -15,7 +15,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "duration.hpp" +#include "time/duration.hpp" #include <ostream> Renamed: lib/time/duration.hpp (+3 -3) 98% =================================================================== --- lib/duration.hpp 2013-03-11 13:08:43 +0900 (834b0d8) +++ lib/time/duration.hpp 2013-03-11 16:03:03 +0900 (d24ae87) @@ -15,8 +15,8 @@ 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_DURATION_HPP -#define GRNXX_DURATION_HPP +#ifndef GRNXX_TIME_DURATION_HPP +#define GRNXX_TIME_DURATION_HPP #include "basic.hpp" #include "string_builder.hpp" @@ -172,4 +172,4 @@ std::ostream &operator<<(std::ostream &stream, Duration duration); } // namespace grnxx -#endif // GRNXX_DURATION_HPP +#endif // GRNXX_TIME_DURATION_HPP Renamed: lib/time/internal_clock.cpp (+2 -2) 97% =================================================================== --- lib/internal_clock.cpp 2013-03-11 13:08:43 +0900 (e23050f) +++ lib/time/internal_clock.cpp 2013-03-11 16:03:03 +0900 (f10c8b9) @@ -15,7 +15,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "internal_clock.hpp" +#include "time/internal_clock.hpp" #include "../config.h" @@ -29,7 +29,7 @@ #include "lock.hpp" #include "logger.hpp" #include "thread.hpp" -#include "system_clock.hpp" +#include "time/system_clock.hpp" namespace grnxx { namespace { Renamed: lib/time/internal_clock.hpp (+4 -4) 87% =================================================================== --- lib/internal_clock.hpp 2013-03-11 13:08:43 +0900 (9e5d6a9) +++ lib/time/internal_clock.hpp 2013-03-11 16:03:03 +0900 (9251494) @@ -15,11 +15,11 @@ 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_INTERNAL_CLOCK_HPP -#define GRNXX_INTERNAL_CLOCK_HPP +#ifndef GRNXX_TIME_INTERNAL_CLOCK_HPP +#define GRNXX_TIME_INTERNAL_CLOCK_HPP #include "basic.hpp" -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { @@ -40,4 +40,4 @@ class InternalClock { } // namespace grnxx -#endif // GRNXX_INTERNAL_CLOCK_HPP +#endif // GRNXX_TIME_INTERNAL_CLOCK_HPP Renamed: lib/time/stopwatch.cpp (+1 -2) 96% =================================================================== --- lib/stopwatch.cpp 2013-03-11 13:08:43 +0900 (d636f2a) +++ lib/time/stopwatch.cpp 2013-03-11 16:03:03 +0900 (046c88a) @@ -15,10 +15,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" #include <chrono> -//#include "steady_clock.hpp" namespace grnxx { namespace { Renamed: lib/time/stopwatch.hpp (+4 -4) 91% =================================================================== --- lib/stopwatch.hpp 2013-03-11 13:08:43 +0900 (2eb308a) +++ lib/time/stopwatch.hpp 2013-03-11 16:03:03 +0900 (dbee7ae) @@ -15,11 +15,11 @@ 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_STOPWATCH_HPP -#define GRNXX_STOPWATCH_HPP +#ifndef GRNXX_TIME_STOPWATCH_HPP +#define GRNXX_TIME_STOPWATCH_HPP #include "basic.hpp" -#include "duration.hpp" +#include "time/duration.hpp" namespace grnxx { @@ -57,4 +57,4 @@ class Stopwatch { } // namespace grnxx -#endif // GRNXX_STOPWATCH_HPP +#endif // GRNXX_TIME_STOPWATCH_HPP Renamed: lib/time/system_clock.cpp (+1 -1) 97% =================================================================== --- lib/system_clock.cpp 2013-03-11 13:08:43 +0900 (dfb1268) +++ lib/time/system_clock.cpp 2013-03-11 16:03:03 +0900 (be1f8ba) @@ -15,7 +15,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "system_clock.hpp" +#include "time/system_clock.hpp" #include <chrono> Renamed: lib/time/system_clock.hpp (+4 -4) 86% =================================================================== --- lib/system_clock.hpp 2013-03-11 13:08:43 +0900 (d1b6111) +++ lib/time/system_clock.hpp 2013-03-11 16:03:03 +0900 (e6cba9e) @@ -15,11 +15,11 @@ 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_SYSTEM_CLOCK_HPP -#define GRNXX_SYSTEM_CLOCK_HPP +#ifndef GRNXX_TIME_SYSTEM_CLOCK_HPP +#define GRNXX_TIME_SYSTEM_CLOCK_HPP #include "basic.hpp" -#include "time.hpp" +#include "time/time.hpp" namespace grnxx { @@ -30,4 +30,4 @@ class SystemClock { } // namespace grnxx -#endif // GRNXX_SYSTEM_CLOCK_HPP +#endif // GRNXX_TIME_SYSTEM_CLOCK_HPP Renamed: lib/time/time.cpp (+1 -1) 99% =================================================================== --- lib/time.cpp 2013-03-11 13:08:43 +0900 (2fd867c) +++ lib/time/time.cpp 2013-03-11 16:03:03 +0900 (569722d) @@ -15,7 +15,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "time.hpp" +#include "time/time.hpp" #include <ctime> #include <ostream> Renamed: lib/time/time.hpp (+5 -5) 95% =================================================================== --- lib/time.hpp 2013-03-11 13:08:43 +0900 (f5feaa7) +++ lib/time/time.hpp 2013-03-11 16:03:03 +0900 (d81e775) @@ -15,12 +15,12 @@ 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_TIME_HPP -#define GRNXX_TIME_HPP +#ifndef GRNXX_TIME_TIME_HPP +#define GRNXX_TIME_TIME_HPP #include "basic.hpp" -#include "broken_down_time.hpp" -#include "duration.hpp" +#include "time/broken_down_time.hpp" +#include "time/duration.hpp" namespace grnxx { @@ -115,4 +115,4 @@ std::ostream &operator<<(std::ostream &stream, Time time); } // namespace grnxx -#endif // GRNXX_TIME_HPP +#endif // GRNXX_TIME_TIME_HPP Modified: test/test_alpha_double_array.cpp (+1 -1) =================================================================== --- test/test_alpha_double_array.cpp 2013-03-11 13:08:43 +0900 (4454744) +++ test/test_alpha_double_array.cpp 2013-03-11 16:03:03 +0900 (bdbe3d0) @@ -23,7 +23,7 @@ #include "alpha/double_array.hpp" #include "logger.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_broken_down_time.cpp (+2 -2) =================================================================== --- test/test_broken_down_time.cpp 2013-03-11 13:08:43 +0900 (85bfd3c) +++ test/test_broken_down_time.cpp 2013-03-11 16:03:03 +0900 (61b7955) @@ -18,8 +18,8 @@ #include <cassert> #include "logger.hpp" -#include "stopwatch.hpp" -#include "system_clock.hpp" +#include "time/stopwatch.hpp" +#include "time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_db_blob_vector.cpp (+1 -1) =================================================================== --- test/test_db_blob_vector.cpp 2013-03-11 13:08:43 +0900 (3c7bf4f) +++ test/test_db_blob_vector.cpp 2013-03-11 16:03:03 +0900 (18d25e1) @@ -22,7 +22,7 @@ #include "db/blob_vector.hpp" #include "logger.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" void test_basics() { grnxx::io::Pool::unlink_if_exists("temp.grn"); Modified: test/test_db_vector.cpp (+1 -1) =================================================================== --- test/test_db_vector.cpp 2013-03-11 13:08:43 +0900 (45152e9) +++ test/test_db_vector.cpp 2013-03-11 16:03:03 +0900 (6367cf4) @@ -22,7 +22,7 @@ #include "db/vector.hpp" #include "logger.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" struct Point { double x; Modified: test/test_duration.cpp (+1 -1) =================================================================== --- test/test_duration.cpp 2013-03-11 13:08:43 +0900 (a174db1) +++ test/test_duration.cpp 2013-03-11 16:03:03 +0900 (552dd69) @@ -18,8 +18,8 @@ #include <cassert> #include <sstream> -#include "duration.hpp" #include "logger.hpp" +#include "time/duration.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_internal_clock.cpp (+2 -2) =================================================================== --- test/test_internal_clock.cpp 2013-03-11 13:08:43 +0900 (f249a5e) +++ test/test_internal_clock.cpp 2013-03-11 16:03:03 +0900 (0de609d) @@ -20,9 +20,9 @@ #include <cassert> #include "logger.hpp" -#include "internal_clock.hpp" -#include "stopwatch.hpp" #include "thread.hpp" +#include "time/internal_clock.hpp" +#include "time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_intrinsic.cpp (+1 -1) =================================================================== --- test/test_intrinsic.cpp 2013-03-11 13:08:43 +0900 (eb14319) +++ test/test_intrinsic.cpp 2013-03-11 16:03:03 +0900 (bbff863) @@ -19,7 +19,7 @@ #include "intrinsic.hpp" #include "logger.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" void test_basics() { assert(grnxx::bit_scan_reverse(std::uint8_t(100)) == 6); Modified: test/test_io_pool.cpp (+1 -1) =================================================================== --- test/test_io_pool.cpp 2013-03-11 13:08:43 +0900 (cbb720e) +++ test/test_io_pool.cpp 2013-03-11 16:03:03 +0900 (fc43859) @@ -23,7 +23,7 @@ #include "io/pool.hpp" #include "logger.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" void test_constructor() { grnxx::io::Pool::unlink_if_exists("temp.grn"); Modified: test/test_map.cpp (+1 -1) =================================================================== --- test/test_map.cpp 2013-03-11 13:08:43 +0900 (e690ece) +++ test/test_map.cpp 2013-03-11 16:03:03 +0900 (31ed283) @@ -23,7 +23,7 @@ #include "map.hpp" #include "logger.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_da_basic_trie.cpp (+1 -1) =================================================================== --- test/test_map_da_basic_trie.cpp 2013-03-11 13:08:43 +0900 (d921d57) +++ test/test_map_da_basic_trie.cpp 2013-03-11 16:03:03 +0900 (7e1f995) @@ -23,7 +23,7 @@ #include "map/da/basic_trie.hpp" #include "logger.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_da_large_trie.cpp (+1 -1) =================================================================== --- test/test_map_da_large_trie.cpp 2013-03-11 13:08:43 +0900 (9601952) +++ test/test_map_da_large_trie.cpp 2013-03-11 16:03:03 +0900 (e0b5fc0) @@ -23,7 +23,7 @@ #include "map/da/large_trie.hpp" #include "logger.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_double_array.cpp (+1 -1) =================================================================== --- test/test_map_double_array.cpp 2013-03-11 13:08:43 +0900 (0fb7534) +++ test/test_map_double_array.cpp 2013-03-11 16:03:03 +0900 (40136e6) @@ -23,7 +23,7 @@ #include "map/double_array.hpp" #include "logger.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_mutex.cpp (+1 -1) =================================================================== --- test/test_mutex.cpp 2013-03-11 13:08:43 +0900 (43d0b1c) +++ test/test_mutex.cpp 2013-03-11 16:03:03 +0900 (593836a) @@ -20,7 +20,7 @@ #include "lock.hpp" #include "logger.hpp" #include "mutex.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_recycler.cpp (+1 -1) =================================================================== --- test/test_recycler.cpp 2013-03-11 13:08:43 +0900 (118c508) +++ test/test_recycler.cpp 2013-03-11 16:03:03 +0900 (cb89557) @@ -19,7 +19,7 @@ #include "logger.hpp" #include "recycler.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" void test() { const grnxx::Duration FROZEN_DURATION = grnxx::Duration::minutes(10); Modified: test/test_stopwatch.cpp (+1 -1) =================================================================== --- test/test_stopwatch.cpp 2013-03-11 13:08:43 +0900 (5401711) +++ test/test_stopwatch.cpp 2013-03-11 16:03:03 +0900 (50e0e3d) @@ -18,8 +18,8 @@ #include <cassert> #include "logger.hpp" -#include "stopwatch.hpp" #include "thread.hpp" +#include "time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_string.cpp (+1 -1) =================================================================== --- test/test_string.cpp 2013-03-11 13:08:43 +0900 (34b1084) +++ test/test_string.cpp 2013-03-11 16:03:03 +0900 (6b46b7d) @@ -19,7 +19,7 @@ #include "logger.hpp" #include "string.hpp" -#include "stopwatch.hpp" +#include "time/stopwatch.hpp" void test_constructors() { assert(!grnxx::String()); Modified: test/test_string_builder.cpp (+1 -1) =================================================================== --- test/test_string_builder.cpp 2013-03-11 13:08:43 +0900 (0d57e06) +++ test/test_string_builder.cpp 2013-03-11 16:03:03 +0900 (d3ac177) @@ -19,7 +19,7 @@ #include "logger.hpp" #include "string_builder.hpp" -#include "time.hpp" +#include "time/time.hpp" void test_basic_operations() { grnxx::StringBuilder builder; Modified: test/test_string_format.cpp (+1 -1) =================================================================== --- test/test_string_format.cpp 2013-03-11 13:08:43 +0900 (380a2dc) +++ test/test_string_format.cpp 2013-03-11 16:03:03 +0900 (0e3d4f2) @@ -21,8 +21,8 @@ #include <sstream> #include "logger.hpp" -#include "stopwatch.hpp" #include "string_format.hpp" +#include "time/stopwatch.hpp" void test_align() { grnxx::StringBuilder builder; Modified: test/test_thread.cpp (+2 -2) =================================================================== --- test/test_thread.cpp 2013-03-11 13:08:43 +0900 (6fb9be8) +++ test/test_thread.cpp 2013-03-11 16:03:03 +0900 (871b274) @@ -19,8 +19,8 @@ #include "logger.hpp" #include "thread.hpp" -#include "stopwatch.hpp" -#include "system_clock.hpp" +#include "time/stopwatch.hpp" +#include "time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_time.cpp (+2 -2) =================================================================== --- test/test_time.cpp 2013-03-11 13:08:43 +0900 (5593767) +++ test/test_time.cpp 2013-03-11 16:03:03 +0900 (c997897) @@ -18,8 +18,8 @@ #include <cassert> #include "logger.hpp" -#include "stopwatch.hpp" -#include "system_clock.hpp" +#include "time/stopwatch.hpp" +#include "time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | -------------- next part -------------- HTML����������������������������...下載
