susumu.yata
null+****@clear*****
Fri Mar 22 20:18:02 JST 2013
susumu.yata 2013-03-22 20:18:02 +0900 (Fri, 22 Mar 2013) New Revision: 542ebcd95eddb75264d1584c9092e9f192b522fb https://github.com/groonga/grnxx/commit/542ebcd95eddb75264d1584c9092e9f192b522fb Message: Move source files from lib/ to lib/grnxx/. Copied files: lib/grnxx/Makefile.am (from lib/Makefile.am) Modified files: .gitignore configure.ac lib/Makefile.am src/Makefile.am src/grnxx.cpp test/Makefile.am test/test_alpha_double_array.cpp test/test_backtrace.cpp test/test_broken_down_time.cpp test/test_charset.cpp test/test_db_blob_vector.cpp test/test_db_vector.cpp test/test_duration.cpp test/test_error.cpp test/test_exception.cpp test/test_features.cpp test/test_grnxx.cpp test/test_internal_clock.cpp test/test_intrinsic.cpp test/test_io_file.cpp test/test_io_file_info.cpp test/test_io_path.cpp test/test_io_pool.cpp test/test_io_view.cpp test/test_logger.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_os.cpp test/test_recycler.cpp test/test_slice.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/grnxx/alpha/Makefile.am (from lib/alpha/Makefile.am) lib/grnxx/alpha/double_array.cpp (from lib/alpha/double_array.cpp) lib/grnxx/alpha/double_array.hpp (from lib/alpha/double_array.hpp) lib/grnxx/alpha/sample.cpp (from lib/alpha/sample.cpp) lib/grnxx/alpha/sample.hpp (from lib/alpha/sample.hpp) lib/grnxx/backtrace.cpp (from lib/backtrace.cpp) lib/grnxx/backtrace.hpp (from lib/backtrace.hpp) lib/grnxx/basic.hpp (from lib/basic.hpp) lib/grnxx/charset.cpp (from lib/charset.cpp) lib/grnxx/charset.hpp (from lib/charset.hpp) lib/grnxx/charset/Makefile.am (from lib/charset/Makefile.am) lib/grnxx/charset/euc-jp.cpp (from lib/charset/euc-jp.cpp) lib/grnxx/charset/euc-jp.hpp (from lib/charset/euc-jp.hpp) lib/grnxx/charset/shift_jis.cpp (from lib/charset/shift_jis.cpp) lib/grnxx/charset/shift_jis.hpp (from lib/charset/shift_jis.hpp) lib/grnxx/charset/utf-8.cpp (from lib/charset/utf-8.cpp) lib/grnxx/charset/utf-8.hpp (from lib/charset/utf-8.hpp) lib/grnxx/db/Makefile.am (from lib/db/Makefile.am) lib/grnxx/db/blob_vector.cpp (from lib/db/blob_vector.cpp) lib/grnxx/db/blob_vector.hpp (from lib/db/blob_vector.hpp) lib/grnxx/db/vector.cpp (from lib/db/vector.cpp) lib/grnxx/db/vector.hpp (from lib/db/vector.hpp) lib/grnxx/error.cpp (from lib/error.cpp) lib/grnxx/error.hpp (from lib/error.hpp) lib/grnxx/exception.hpp (from lib/exception.hpp) lib/grnxx/features.hpp (from lib/features.hpp) lib/grnxx/flags_impl.hpp (from lib/flags_impl.hpp) lib/grnxx/grnxx.cpp (from lib/grnxx.cpp) lib/grnxx/grnxx.hpp (from lib/grnxx.hpp) lib/grnxx/intrinsic.hpp (from lib/intrinsic.hpp) lib/grnxx/io/Makefile.am (from lib/io/Makefile.am) lib/grnxx/io/block.cpp (from lib/io/block.cpp) lib/grnxx/io/block.hpp (from lib/io/block.hpp) lib/grnxx/io/chunk.cpp (from lib/io/chunk.cpp) lib/grnxx/io/chunk.hpp (from lib/io/chunk.hpp) lib/grnxx/io/file-posix.cpp (from lib/io/file-posix.cpp) lib/grnxx/io/file-posix.hpp (from lib/io/file-posix.hpp) lib/grnxx/io/file-windows.cpp (from lib/io/file-windows.cpp) lib/grnxx/io/file-windows.hpp (from lib/io/file-windows.hpp) lib/grnxx/io/file.cpp (from lib/io/file.cpp) lib/grnxx/io/file.hpp (from lib/io/file.hpp) lib/grnxx/io/file_info.cpp (from lib/io/file_info.cpp) lib/grnxx/io/file_info.hpp (from lib/io/file_info.hpp) lib/grnxx/io/path.cpp (from lib/io/path.cpp) lib/grnxx/io/path.hpp (from lib/io/path.hpp) lib/grnxx/io/pool-impl.cpp (from lib/io/pool-impl.cpp) lib/grnxx/io/pool-impl.hpp (from lib/io/pool-impl.hpp) lib/grnxx/io/pool.cpp (from lib/io/pool.cpp) lib/grnxx/io/pool.hpp (from lib/io/pool.hpp) lib/grnxx/io/view-posix.cpp (from lib/io/view-posix.cpp) lib/grnxx/io/view-posix.hpp (from lib/io/view-posix.hpp) lib/grnxx/io/view-windows.cpp (from lib/io/view-windows.cpp) lib/grnxx/io/view-windows.hpp (from lib/io/view-windows.hpp) lib/grnxx/io/view.cpp (from lib/io/view.cpp) lib/grnxx/io/view.hpp (from lib/io/view.hpp) lib/grnxx/lock.hpp (from lib/lock.hpp) lib/grnxx/logger.cpp (from lib/logger.cpp) lib/grnxx/logger.hpp (from lib/logger.hpp) lib/grnxx/map.cpp (from lib/map.cpp) lib/grnxx/map.hpp (from lib/map.hpp) lib/grnxx/map/Makefile.am (from lib/map/Makefile.am) lib/grnxx/map/da/Makefile.am (from lib/map/da/Makefile.am) lib/grnxx/map/da/basic/Makefile.am (from lib/map/da/basic/Makefile.am) lib/grnxx/map/da/basic/id_cursor.cpp (from lib/map/da/basic/id_cursor.cpp) lib/grnxx/map/da/basic/id_cursor.hpp (from lib/map/da/basic/id_cursor.hpp) lib/grnxx/map/da/basic/key_cursor.cpp (from lib/map/da/basic/key_cursor.cpp) lib/grnxx/map/da/basic/key_cursor.hpp (from lib/map/da/basic/key_cursor.hpp) lib/grnxx/map/da/basic/predictive_cursor.cpp (from lib/map/da/basic/predictive_cursor.cpp) lib/grnxx/map/da/basic/predictive_cursor.hpp (from lib/map/da/basic/predictive_cursor.hpp) lib/grnxx/map/da/basic/prefix_cursor.cpp (from lib/map/da/basic/prefix_cursor.cpp) lib/grnxx/map/da/basic/prefix_cursor.hpp (from lib/map/da/basic/prefix_cursor.hpp) lib/grnxx/map/da/basic/trie.cpp (from lib/map/da/basic/trie.cpp) lib/grnxx/map/da/basic/trie.hpp (from lib/map/da/basic/trie.hpp) lib/grnxx/map/da/large/Makefile.am (from lib/map/da/large/Makefile.am) lib/grnxx/map/da/large/id_cursor.cpp (from lib/map/da/large/id_cursor.cpp) lib/grnxx/map/da/large/id_cursor.hpp (from lib/map/da/large/id_cursor.hpp) lib/grnxx/map/da/large/key_cursor.cpp (from lib/map/da/large/key_cursor.cpp) lib/grnxx/map/da/large/key_cursor.hpp (from lib/map/da/large/key_cursor.hpp) lib/grnxx/map/da/large/predictive_cursor.cpp (from lib/map/da/large/predictive_cursor.cpp) lib/grnxx/map/da/large/predictive_cursor.hpp (from lib/map/da/large/predictive_cursor.hpp) lib/grnxx/map/da/large/prefix_cursor.cpp (from lib/map/da/large/prefix_cursor.cpp) lib/grnxx/map/da/large/prefix_cursor.hpp (from lib/map/da/large/prefix_cursor.hpp) lib/grnxx/map/da/large/trie.cpp (from lib/map/da/large/trie.cpp) lib/grnxx/map/da/large/trie.hpp (from lib/map/da/large/trie.hpp) lib/grnxx/map/da/trie.cpp (from lib/map/da/trie.cpp) lib/grnxx/map/da/trie.hpp (from lib/map/da/trie.hpp) lib/grnxx/map/double_array.cpp (from lib/map/double_array.cpp) lib/grnxx/map/double_array.hpp (from lib/map/double_array.hpp) lib/grnxx/mutex.cpp (from lib/mutex.cpp) lib/grnxx/mutex.hpp (from lib/mutex.hpp) lib/grnxx/os.cpp (from lib/os.cpp) lib/grnxx/os.hpp (from lib/os.hpp) lib/grnxx/recycler.cpp (from lib/recycler.cpp) lib/grnxx/recycler.hpp (from lib/recycler.hpp) lib/grnxx/slice.cpp (from lib/slice.cpp) lib/grnxx/slice.hpp (from lib/slice.hpp) lib/grnxx/storage.cpp (from lib/storage.cpp) lib/grnxx/storage.hpp (from lib/storage.hpp) lib/grnxx/string.cpp (from lib/string.cpp) lib/grnxx/string.hpp (from lib/string.hpp) lib/grnxx/string_builder.cpp (from lib/string_builder.cpp) lib/grnxx/string_builder.hpp (from lib/string_builder.hpp) lib/grnxx/string_format.hpp (from lib/string_format.hpp) lib/grnxx/thread.cpp (from lib/thread.cpp) lib/grnxx/thread.hpp (from lib/thread.hpp) lib/grnxx/time/Makefile.am (from lib/time/Makefile.am) lib/grnxx/time/broken_down_time.cpp (from lib/time/broken_down_time.cpp) lib/grnxx/time/broken_down_time.hpp (from lib/time/broken_down_time.hpp) lib/grnxx/time/duration.cpp (from lib/time/duration.cpp) lib/grnxx/time/duration.hpp (from lib/time/duration.hpp) lib/grnxx/time/internal_clock.cpp (from lib/time/internal_clock.cpp) lib/grnxx/time/internal_clock.hpp (from lib/time/internal_clock.hpp) lib/grnxx/time/periodic_clock.cpp (from lib/time/periodic_clock.cpp) lib/grnxx/time/periodic_clock.hpp (from lib/time/periodic_clock.hpp) lib/grnxx/time/stopwatch.cpp (from lib/time/stopwatch.cpp) lib/grnxx/time/stopwatch.hpp (from lib/time/stopwatch.hpp) lib/grnxx/time/system_clock.cpp (from lib/time/system_clock.cpp) lib/grnxx/time/system_clock.hpp (from lib/time/system_clock.hpp) lib/grnxx/time/time.cpp (from lib/time/time.cpp) lib/grnxx/time/time.hpp (from lib/time/time.hpp) lib/grnxx/version.sh (from lib/version.sh) Modified: .gitignore (+1 -1) =================================================================== --- .gitignore 2013-03-22 13:08:07 +0900 (07d1a0f) +++ .gitignore 2013-03-22 20:18:02 +0900 (ce0d5e5) @@ -20,7 +20,7 @@ config.* configure depcomp install-sh -lib/version.h +lib/grnxx/version.h libtool ltmain.sh missing Modified: configure.ac (+11 -10) =================================================================== --- configure.ac 2013-03-22 13:08:07 +0900 (6986ad4) +++ configure.ac 2013-03-22 20:18:02 +0900 (43f6b37) @@ -3,7 +3,7 @@ AC_PREREQ([2.67]) AC_INIT([grnxx], [pre-alpha], [groonga �� razil.jp]) -AC_CONFIG_SRCDIR([lib/grnxx.hpp]) +AC_CONFIG_SRCDIR([lib/grnxx/grnxx.hpp]) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE @@ -59,15 +59,16 @@ AC_CHECK_FUNC([nanosleep], AC_CONFIG_FILES([Makefile lib/Makefile - lib/alpha/Makefile - lib/charset/Makefile - lib/db/Makefile - lib/io/Makefile - lib/map/Makefile - lib/map/da/Makefile - lib/map/da/basic/Makefile - lib/map/da/large/Makefile - lib/time/Makefile + lib/grnxx/Makefile + lib/grnxx/alpha/Makefile + lib/grnxx/charset/Makefile + lib/grnxx/db/Makefile + lib/grnxx/io/Makefile + lib/grnxx/map/Makefile + lib/grnxx/map/da/Makefile + lib/grnxx/map/da/basic/Makefile + lib/grnxx/map/da/large/Makefile + lib/grnxx/time/Makefile src/Makefile test/Makefile]) AC_OUTPUT Modified: lib/Makefile.am (+1 -65) =================================================================== --- lib/Makefile.am 2013-03-22 13:08:07 +0900 (0f3dea6) +++ lib/Makefile.am 2013-03-22 20:18:02 +0900 (767034a) @@ -1,65 +1 @@ -SUBDIRS = alpha charset db io map time - -lib_LTLIBRARIES = libgrnxx.la - -libgrnxx_la_LIBADD = \ - alpha/libgrnxx_alpha.la \ - charset/libgrnxx_charset.la \ - db/libgrnxx_db.la \ - io/libgrnxx_io.la \ - map/libgrnxx_map.la \ - time/libgrnxx_time.la - -libgrnxx_la_LDFLAGS = @AM_LTLDFLAGS@ - -libgrnxx_la_SOURCES = \ - backtrace.cpp \ - charset.cpp \ - error.cpp \ - grnxx.cpp \ - logger.cpp \ - map.cpp \ - mutex.cpp \ - os.cpp \ - recycler.cpp \ - slice.cpp \ - storage.cpp \ - string.cpp \ - string_builder.cpp \ - thread.cpp - -libgrnxx_includedir = ${includedir}/grnxx -libgrnxx_include_HEADERS = \ - backtrace.hpp \ - basic.hpp \ - charset.hpp \ - error.hpp \ - exception.hpp \ - features.hpp \ - flags_impl.hpp \ - grnxx.hpp \ - intrinsic.hpp \ - lock.hpp \ - logger.hpp \ - map.hpp \ - mutex.hpp \ - os.hpp \ - recycler.hpp \ - slice.hpp \ - storage.hpp \ - string.hpp \ - string_builder.hpp \ - string_format.hpp \ - thread.hpp \ - version.h - -EXTRA_DIST = version.sh - -.PHONY: FORCE - -FORCE: - -grnxx.cpp: version.h - -version.h: FORCE - TOP_SRCDIR="$(top_srcdir)" "$(srcdir)/version.sh" +SUBDIRS = grnxx Copied: lib/grnxx/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/alpha/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/alpha/double_array.cpp (+4 -4) 99% =================================================================== --- lib/alpha/double_array.cpp 2013-03-22 13:08:07 +0900 (2fb377a) +++ lib/grnxx/alpha/double_array.cpp 2013-03-22 20:18:02 +0900 (08a6444) @@ -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 */ -#include "alpha/double_array.hpp" +#include "grnxx/alpha/double_array.hpp" -#include "exception.hpp" -#include "lock.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace alpha { Renamed: lib/grnxx/alpha/double_array.hpp (+1 -1) 99% =================================================================== --- lib/alpha/double_array.hpp 2013-03-22 13:08:07 +0900 (7bc6838) +++ lib/grnxx/alpha/double_array.hpp 2013-03-22 20:18:02 +0900 (2a3ec0a) @@ -18,7 +18,7 @@ #ifndef GRNXX_ALPHA_DOUBLE_ARRAY_HPP #define GRNXX_ALPHA_DOUBLE_ARRAY_HPP -#include "db/vector.hpp" +#include "grnxx/db/vector.hpp" namespace grnxx { namespace alpha { Renamed: lib/grnxx/alpha/sample.cpp (+1 -1) 96% =================================================================== --- lib/alpha/sample.cpp 2013-03-22 13:08:07 +0900 (d55f1c8) +++ lib/grnxx/alpha/sample.cpp 2013-03-22 20:18:02 +0900 (976aae2) @@ -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 "sample.hpp" +#include "grnxx/alpha/sample.hpp" namespace grnxx { namespace alpha { Renamed: lib/grnxx/alpha/sample.hpp (+0 -0) 100% =================================================================== Renamed: lib/grnxx/backtrace.cpp (+2 -2) 99% =================================================================== --- lib/backtrace.cpp 2013-03-22 13:08:07 +0900 (1d557bf) +++ lib/grnxx/backtrace.cpp 2013-03-22 20:18:02 +0900 (a8ac836) @@ -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 "backtrace.hpp" +#include "grnxx/backtrace.hpp" #include "../config.h" @@ -37,7 +37,7 @@ #include <cstdlib> #include <sstream> -#include "lock.hpp" +#include "grnxx/lock.hpp" namespace grnxx { namespace { Renamed: lib/grnxx/backtrace.hpp (+1 -1) 98% =================================================================== --- lib/backtrace.hpp 2013-03-22 13:08:07 +0900 (4b0608c) +++ lib/grnxx/backtrace.hpp 2013-03-22 20:18:02 +0900 (0f25790) @@ -21,7 +21,7 @@ #include <string> #include <vector> -#include "basic.hpp" +#include "grnxx/basic.hpp" namespace grnxx { Renamed: lib/grnxx/basic.hpp (+1 -1) 98% =================================================================== --- lib/basic.hpp 2013-03-22 13:08:07 +0900 (01010af) +++ lib/grnxx/basic.hpp 2013-03-22 20:18:02 +0900 (251120f) @@ -18,7 +18,7 @@ #ifndef GRNXX_BASIC_HPP #define GRNXX_BASIC_HPP -#include "features.hpp" +#include "grnxx/features.hpp" #include <cstdint> #include <cstdio> Renamed: lib/grnxx/charset.cpp (+4 -4) 92% =================================================================== --- lib/charset.cpp 2013-03-22 13:08:07 +0900 (04e23d0) +++ lib/grnxx/charset.cpp 2013-03-22 20:18:02 +0900 (296ed34) @@ -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 */ -#include "charset.hpp" +#include "grnxx/charset.hpp" -#include "charset/euc-jp.hpp" -#include "charset/shift_jis.hpp" -#include "charset/utf-8.hpp" +#include "grnxx/charset/euc-jp.hpp" +#include "grnxx/charset/shift_jis.hpp" +#include "grnxx/charset/utf-8.hpp" namespace grnxx { Renamed: lib/grnxx/charset.hpp (+3 -3) 94% =================================================================== --- lib/charset.hpp 2013-03-22 13:08:07 +0900 (0a8f88c) +++ lib/grnxx/charset.hpp 2013-03-22 20:18:02 +0900 (5ff07c2) @@ -18,9 +18,9 @@ #ifndef GRNXX_CHARSET_HPP #define GRNXX_CHARSET_HPP -#include "basic.hpp" -#include "slice.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/slice.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { Renamed: lib/grnxx/charset/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/charset/euc-jp.cpp (+1 -1) 98% =================================================================== --- lib/charset/euc-jp.cpp 2013-03-22 13:08:07 +0900 (346f448) +++ lib/grnxx/charset/euc-jp.cpp 2013-03-22 20:18:02 +0900 (2e5887c) @@ -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 "charset/euc-jp.hpp" +#include "grnxx/charset/euc-jp.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/charset/euc-jp.hpp (+1 -1) 97% =================================================================== --- lib/charset/euc-jp.hpp 2013-03-22 13:08:07 +0900 (306d127) +++ lib/grnxx/charset/euc-jp.hpp 2013-03-22 20:18:02 +0900 (0475a86) @@ -18,7 +18,7 @@ #ifndef GRNXX_CHARSET_EUC_JP_HPP #define GRNXX_CHARSET_EUC_JP_HPP -#include "charset.hpp" +#include "grnxx/charset.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/charset/shift_jis.cpp (+1 -1) 97% =================================================================== --- lib/charset/shift_jis.cpp 2013-03-22 13:08:07 +0900 (9ea4f49) +++ lib/grnxx/charset/shift_jis.cpp 2013-03-22 20:18:02 +0900 (3fe8060) @@ -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 "charset/shift_jis.hpp" +#include "grnxx/charset/shift_jis.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/charset/shift_jis.hpp (+1 -1) 97% =================================================================== --- lib/charset/shift_jis.hpp 2013-03-22 13:08:07 +0900 (a4095f6) +++ lib/grnxx/charset/shift_jis.hpp 2013-03-22 20:18:02 +0900 (6601678) @@ -18,7 +18,7 @@ #ifndef GRNXX_CHARSET_SHIFT_JIS_HPP #define GRNXX_CHARSET_SHIFT_JIS_HPP -#include "charset.hpp" +#include "grnxx/charset.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/charset/utf-8.cpp (+2 -2) 97% =================================================================== --- lib/charset/utf-8.cpp 2013-03-22 13:08:07 +0900 (d9e618d) +++ lib/grnxx/charset/utf-8.cpp 2013-03-22 20:18:02 +0900 (835611e) @@ -15,9 +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 "charset/utf-8.hpp" +#include "grnxx/charset/utf-8.hpp" -#include "intrinsic.hpp" +#include "grnxx/intrinsic.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/charset/utf-8.hpp (+1 -1) 97% =================================================================== --- lib/charset/utf-8.hpp 2013-03-22 13:08:07 +0900 (5ffc75a) +++ lib/grnxx/charset/utf-8.hpp 2013-03-22 20:18:02 +0900 (4b642c8) @@ -18,7 +18,7 @@ #ifndef GRNXX_CHARSET_UTF_8_HPP #define GRNXX_CHARSET_UTF_8_HPP -#include "charset.hpp" +#include "grnxx/charset.hpp" namespace grnxx { namespace charset { Renamed: lib/grnxx/db/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/db/blob_vector.cpp (+4 -4) 99% =================================================================== --- lib/db/blob_vector.cpp 2013-03-22 13:08:07 +0900 (8e7c5ee) +++ lib/grnxx/db/blob_vector.cpp 2013-03-22 20:18:02 +0900 (692d27b) @@ -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 */ -#include "db/blob_vector.hpp" +#include "grnxx/db/blob_vector.hpp" -#include "exception.hpp" -#include "lock.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace db { Renamed: lib/grnxx/db/blob_vector.hpp (+1 -1) 99% =================================================================== --- lib/db/blob_vector.hpp 2013-03-22 13:08:07 +0900 (7dc2d14) +++ lib/grnxx/db/blob_vector.hpp 2013-03-22 20:18:02 +0900 (fccf034) @@ -18,7 +18,7 @@ #ifndef GRNXX_DB_BLOB_VECTOR_HPP #define GRNXX_DB_BLOB_VECTOR_HPP -#include "db/vector.hpp" +#include "grnxx/db/vector.hpp" namespace grnxx { namespace db { Renamed: lib/grnxx/db/vector.cpp (+4 -4) 99% =================================================================== --- lib/db/vector.cpp 2013-03-22 13:08:07 +0900 (03f8c5d) +++ lib/grnxx/db/vector.cpp 2013-03-22 20:18:02 +0900 (c373131) @@ -15,13 +15,13 @@ 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 "db/vector.hpp" +#include "grnxx/db/vector.hpp" #include <vector> -#include "exception.hpp" -#include "lock.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace db { Renamed: lib/grnxx/db/vector.hpp (+1 -1) 99% =================================================================== --- lib/db/vector.hpp 2013-03-22 13:08:07 +0900 (2a62ed9) +++ lib/grnxx/db/vector.hpp 2013-03-22 20:18:02 +0900 (a585573) @@ -18,7 +18,7 @@ #ifndef GRNXX_DB_VECTOR_HPP #define GRNXX_DB_VECTOR_HPP -#include "io/pool.hpp" +#include "grnxx/io/pool.hpp" namespace grnxx { namespace db { Renamed: lib/grnxx/error.cpp (+1 -1) 98% =================================================================== --- lib/error.cpp 2013-03-22 13:08:07 +0900 (1f419e3) +++ lib/grnxx/error.cpp 2013-03-22 20:18:02 +0900 (9605d36) @@ -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 "error.hpp" +#include "grnxx/error.hpp" #ifdef GRNXX_WINDOWS # ifndef NOMINMAX Renamed: lib/grnxx/error.hpp (+2 -2) 97% =================================================================== --- lib/error.hpp 2013-03-22 13:08:07 +0900 (0787390) +++ lib/grnxx/error.hpp 2013-03-22 20:18:02 +0900 (64d74a4) @@ -18,8 +18,8 @@ #ifndef GRNXX_ERROR_HPP #define GRNXX_ERROR_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { Renamed: lib/grnxx/exception.hpp (+1 -1) 97% =================================================================== --- lib/exception.hpp 2013-03-22 13:08:07 +0900 (831cc3a) +++ lib/grnxx/exception.hpp 2013-03-22 20:18:02 +0900 (214672c) @@ -18,7 +18,7 @@ #ifndef GRNXX_EXCEPTION_HPP #define GRNXX_EXCEPTION_HPP -#include "basic.hpp" +#include "grnxx/basic.hpp" #define GRNXX_THROW() (throw ::grnxx::Exception()) Renamed: lib/grnxx/features.hpp (+0 -0) 100% =================================================================== Renamed: lib/grnxx/flags_impl.hpp (+1 -1) 98% =================================================================== --- lib/flags_impl.hpp 2013-03-22 13:08:07 +0900 (6c990e5) +++ lib/grnxx/flags_impl.hpp 2013-03-22 20:18:02 +0900 (44f8dfd) @@ -18,7 +18,7 @@ #ifndef GRNXX_FLAGS_IMPL_HPP #define GRNXX_FLAGS_IMPL_HPP -#include "basic.hpp" +#include "grnxx/basic.hpp" namespace grnxx { Renamed: lib/grnxx/grnxx.cpp (+2 -2) 95% =================================================================== --- lib/grnxx.cpp 2013-03-22 13:08:07 +0900 (6659a1e) +++ lib/grnxx/grnxx.cpp 2013-03-22 20:18:02 +0900 (e984a31) @@ -15,10 +15,10 @@ 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 "grnxx.hpp" +#include "grnxx/grnxx.hpp" #include "../config.h" -#include "version.h" +#include "grnxx/version.h" namespace grnxx { Renamed: lib/grnxx/grnxx.hpp (+1 -1) 97% =================================================================== --- lib/grnxx.hpp 2013-03-22 13:08:07 +0900 (6c49aed) +++ lib/grnxx/grnxx.hpp 2013-03-22 20:18:02 +0900 (f7f5563) @@ -18,7 +18,7 @@ #ifndef GRNXX_GRNXX_HPP #define GRNXX_GRNXX_HPP -#include "basic.hpp" +#include "grnxx/basic.hpp" namespace grnxx { Renamed: lib/grnxx/intrinsic.hpp (+1 -1) 99% =================================================================== --- lib/intrinsic.hpp 2013-03-22 13:08:07 +0900 (3f60fa2) +++ lib/grnxx/intrinsic.hpp 2013-03-22 20:18:02 +0900 (6d92a2b) @@ -18,7 +18,7 @@ #ifndef GRNXX_INTRINSIC_HPP #define GRNXX_INTRINSIC_HPP -#include "basic.hpp" +#include "grnxx/basic.hpp" #ifdef GRNXX_MSC # include <intrin.h> Renamed: lib/grnxx/io/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/io/block.cpp (+1 -1) 98% =================================================================== --- lib/io/block.cpp 2013-03-22 13:08:07 +0900 (f537a96) +++ lib/grnxx/io/block.cpp 2013-03-22 20:18:02 +0900 (8220406) @@ -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 "io/block.hpp" +#include "grnxx/io/block.hpp" #include <ostream> Renamed: lib/grnxx/io/block.hpp (+1 -1) 99% =================================================================== --- lib/io/block.hpp 2013-03-22 13:08:07 +0900 (085d66a) +++ lib/grnxx/io/block.hpp 2013-03-22 20:18:02 +0900 (9971adb) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_BLOCK_HPP #define GRNXX_IO_BLOCK_HPP -#include "string_builder.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/chunk.cpp (+1 -1) 97% =================================================================== --- lib/io/chunk.cpp 2013-03-22 13:08:07 +0900 (68384c0) +++ lib/grnxx/io/chunk.cpp 2013-03-22 20:18:02 +0900 (25bc7dd) @@ -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 "io/chunk.hpp" +#include "grnxx/io/chunk.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/chunk.hpp (+2 -2) 98% =================================================================== --- lib/io/chunk.hpp 2013-03-22 13:08:07 +0900 (11be26d) +++ lib/grnxx/io/chunk.hpp 2013-03-22 20:18:02 +0900 (bb80b9a) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_CHUNK_HPP #define GRNXX_IO_CHUNK_HPP -#include "io/block.hpp" -#include "io/view.hpp" +#include "grnxx/io/block.hpp" +#include "grnxx/io/view.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file-posix.cpp (+7 -7) 98% =================================================================== --- lib/io/file-posix.cpp 2013-03-22 13:08:07 +0900 (924cf75) +++ lib/grnxx/io/file-posix.cpp 2013-03-22 20:18:02 +0900 (12aa390) @@ -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 "io/file-posix.hpp" +#include "grnxx/io/file-posix.hpp" #ifndef GRNXX_WINDOWS @@ -27,12 +27,12 @@ #include <algorithm> -#include "error.hpp" -#include "exception.hpp" -#include "io/path.hpp" -#include "logger.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/path.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file-posix.hpp (+1 -1) 98% =================================================================== --- lib/io/file-posix.hpp 2013-03-22 13:08:07 +0900 (a90cd6f) +++ lib/grnxx/io/file-posix.hpp 2013-03-22 20:18:02 +0900 (97550c0) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_POSIX_HPP #define GRNXX_IO_FILE_POSIX_HPP -#include "io/file.hpp" +#include "grnxx/io/file.hpp" #ifndef GRNXX_WINDOWS Renamed: lib/grnxx/io/file-windows.cpp (+7 -7) 98% =================================================================== --- lib/io/file-windows.cpp 2013-03-22 13:08:07 +0900 (689801f) +++ lib/grnxx/io/file-windows.cpp 2013-03-22 20:18:02 +0900 (83fae2d) @@ -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 "io/file-windows.hpp" +#include "grnxx/io/file-windows.hpp" #ifdef GRNXX_WINDOWS @@ -23,12 +23,12 @@ #include <sys/stat.h> #include <io.h> -#include "error.hpp" -#include "exception.hpp" -#include "io/path.hpp" -#include "logger.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/path.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file-windows.hpp (+1 -1) 98% =================================================================== --- lib/io/file-windows.hpp 2013-03-22 13:08:07 +0900 (27228b4) +++ lib/grnxx/io/file-windows.hpp 2013-03-22 20:18:02 +0900 (a56785b) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_WINDOWS_HPP #define GRNXX_IO_FILE_WINDOWS_HPP -#include "io/file.hpp" +#include "grnxx/io/file.hpp" #ifdef GRNXX_WINDOWS Renamed: lib/grnxx/io/file.cpp (+5 -5) 92% =================================================================== --- lib/io/file.cpp 2013-03-22 13:08:07 +0900 (5cded4b) +++ lib/grnxx/io/file.cpp 2013-03-22 20:18:02 +0900 (6f51565) @@ -15,14 +15,14 @@ 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 "io/file.hpp" +#include "grnxx/io/file.hpp" #include <ostream> -#include "exception.hpp" -#include "io/file-posix.hpp" -#include "io/file-windows.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/file-posix.hpp" +#include "grnxx/io/file-windows.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file.hpp (+1 -1) 99% =================================================================== --- lib/io/file.hpp 2013-03-22 13:08:07 +0900 (2e7e778) +++ lib/grnxx/io/file.hpp 2013-03-22 20:18:02 +0900 (30334e0) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_HPP #define GRNXX_IO_FILE_HPP -#include "time/duration.hpp" +#include "grnxx/time/duration.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file_info.cpp (+5 -5) 97% =================================================================== --- lib/io/file_info.cpp 2013-03-22 13:08:07 +0900 (81a7673) +++ lib/grnxx/io/file_info.cpp 2013-03-22 20:18:02 +0900 (ed5d8f0) @@ -15,17 +15,17 @@ 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 "io/file_info.hpp" +#include "grnxx/io/file_info.hpp" #include <sys/types.h> #include <sys/stat.h> #include <cerrno> -#include "error.hpp" -#include "exception.hpp" -#include "io/file.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/file_info.hpp (+1 -1) 98% =================================================================== --- lib/io/file_info.hpp 2013-03-22 13:08:07 +0900 (1dbffd8) +++ lib/grnxx/io/file_info.hpp 2013-03-22 20:18:02 +0900 (816f18b) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_INFO_HPP #define GRNXX_IO_FILE_INFO_HPP -#include "time/time.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/path.cpp (+4 -4) 96% =================================================================== --- lib/io/path.cpp 2013-03-22 13:08:07 +0900 (933a5cc) +++ lib/grnxx/io/path.cpp 2013-03-22 20:18:02 +0900 (0d9020b) @@ -15,15 +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 */ -#include "io/path.hpp" +#include "grnxx/io/path.hpp" #include <cerrno> #include <cstdlib> #include <random> -#include "error.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/path.hpp (+1 -1) 98% =================================================================== --- lib/io/path.hpp 2013-03-22 13:08:07 +0900 (17295b2) +++ lib/grnxx/io/path.hpp 2013-03-22 20:18:02 +0900 (e563b7f) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_PATH_HPP #define GRNXX_IO_PATH_HPP -#include "string.hpp" +#include "grnxx/string.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/pool-impl.cpp (+8 -8) 99% =================================================================== --- lib/io/pool-impl.cpp 2013-03-22 13:08:07 +0900 (8ae3e1e) +++ lib/grnxx/io/pool-impl.cpp 2013-03-22 20:18:02 +0900 (5adb26d) @@ -15,17 +15,17 @@ 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 "io/pool-impl.hpp" +#include "grnxx/io/pool-impl.hpp" #include <vector> -#include "exception.hpp" -#include "io/path.hpp" -#include "lock.hpp" -#include "logger.hpp" -#include "string_format.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/path.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/string_format.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/pool-impl.hpp (+2 -2) 98% =================================================================== --- lib/io/pool-impl.hpp 2013-03-22 13:08:07 +0900 (445e76d) +++ lib/grnxx/io/pool-impl.hpp 2013-03-22 20:18:02 +0900 (ac7bd0a) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_POOL_IMPL_HPP #define GRNXX_IO_POOL_IMPL_HPP -#include "io/file.hpp" -#include "io/pool.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/io/pool.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/pool.cpp (+3 -3) 99% =================================================================== --- lib/io/pool.cpp 2013-03-22 13:08:07 +0900 (dcfb1d0) +++ lib/grnxx/io/pool.cpp 2013-03-22 20:18:02 +0900 (2859cfa) @@ -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 */ -#include "io/pool-impl.hpp" +#include "grnxx/io/pool-impl.hpp" #include <ostream> -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/pool.hpp (+3 -3) 99% =================================================================== --- lib/io/pool.hpp 2013-03-22 13:08:07 +0900 (63301b5) +++ lib/grnxx/io/pool.hpp 2013-03-22 20:18:02 +0900 (0424dd3) @@ -18,9 +18,9 @@ #ifndef GRNXX_IO_POOL_HPP #define GRNXX_IO_POOL_HPP -#include "io/chunk.hpp" -#include "mutex.hpp" -#include "recycler.hpp" +#include "grnxx/io/chunk.hpp" +#include "grnxx/mutex.hpp" +#include "grnxx/recycler.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/view-posix.cpp (+5 -5) 97% =================================================================== --- lib/io/view-posix.cpp 2013-03-22 13:08:07 +0900 (e5b2670) +++ lib/grnxx/io/view-posix.cpp 2013-03-22 20:18:02 +0900 (3acf89a) @@ -15,17 +15,17 @@ 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 "io/view-posix.hpp" +#include "grnxx/io/view-posix.hpp" #ifndef GRNXX_WINDOWS #include <sys/mman.h> #include <errno.h> -#include "error.hpp" -#include "exception.hpp" -#include "io/file.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/logger.hpp" #ifndef MAP_ANONYMOUS # ifdef MAP_ANON Renamed: lib/grnxx/io/view-posix.hpp (+1 -1) 98% =================================================================== --- lib/io/view-posix.hpp 2013-03-22 13:08:07 +0900 (5e6aa1c) +++ lib/grnxx/io/view-posix.hpp 2013-03-22 20:18:02 +0900 (de91043) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_VIEW_POSIX_HPP #define GRNXX_IO_VIEW_POSIX_HPP -#include "io/view.hpp" +#include "grnxx/io/view.hpp" #ifndef GRNXX_WINDOWS Renamed: lib/grnxx/io/view-windows.cpp (+5 -5) 98% =================================================================== --- lib/io/view-windows.cpp 2013-03-22 13:08:07 +0900 (a26bdf6) +++ lib/grnxx/io/view-windows.cpp 2013-03-22 20:18:02 +0900 (c846c1c) @@ -15,14 +15,14 @@ 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 "io/view-windows.hpp" +#include "grnxx/io/view-windows.hpp" #ifdef GRNXX_WINDOWS -#include "error.hpp" -#include "exception.hpp" -#include "io/file.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/view-windows.hpp (+1 -1) 98% =================================================================== --- lib/io/view-windows.hpp 2013-03-22 13:08:07 +0900 (e93fa1e) +++ lib/grnxx/io/view-windows.hpp 2013-03-22 20:18:02 +0900 (7480217) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_VIEW_WINDOWS_HPP #define GRNXX_IO_VIEW_WINDOWS_HPP -#include "io/view.hpp" +#include "grnxx/io/view.hpp" #ifdef GRNXX_WINDOWS Renamed: lib/grnxx/io/view.cpp (+5 -5) 92% =================================================================== --- lib/io/view.cpp 2013-03-22 13:08:07 +0900 (b3ced46) +++ lib/grnxx/io/view.cpp 2013-03-22 20:18:02 +0900 (79cddf3) @@ -15,14 +15,14 @@ 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 "io/view.hpp" +#include "grnxx/io/view.hpp" #include <ostream> -#include "exception.hpp" -#include "io/view-posix.hpp" -#include "io/view-windows.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/io/view-posix.hpp" +#include "grnxx/io/view-windows.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/io/view.hpp (+2 -2) 98% =================================================================== --- lib/io/view.hpp 2013-03-22 13:08:07 +0900 (745cdb4) +++ lib/grnxx/io/view.hpp 2013-03-22 20:18:02 +0900 (653172e) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_VIEW_HPP #define GRNXX_IO_VIEW_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { namespace io { Renamed: lib/grnxx/lock.hpp (+2 -2) 96% =================================================================== --- lib/lock.hpp 2013-03-22 13:08:07 +0900 (b9f9977) +++ lib/grnxx/lock.hpp 2013-03-22 20:18:02 +0900 (1115d47) @@ -18,8 +18,8 @@ #ifndef GRNXX_LOCK_HPP #define GRNXX_LOCK_HPP -#include "basic.hpp" -#include "mutex.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/mutex.hpp" namespace grnxx { Renamed: lib/grnxx/logger.cpp (+4 -4) 97% =================================================================== --- lib/logger.cpp 2013-03-22 13:08:07 +0900 (0902f4f) +++ lib/grnxx/logger.cpp 2013-03-22 20:18:02 +0900 (3fe4c79) @@ -15,15 +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 */ -#include "logger.hpp" +#include "grnxx/logger.hpp" #include <ctime> #include <fstream> #include <iostream> -#include "backtrace.hpp" -#include "lock.hpp" -#include "time/system_clock.hpp" +#include "grnxx/backtrace.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/time/system_clock.hpp" namespace grnxx { Renamed: lib/grnxx/logger.hpp (+2 -2) 98% =================================================================== --- lib/logger.hpp 2013-03-22 13:08:07 +0900 (3ac45e2) +++ lib/grnxx/logger.hpp 2013-03-22 20:18:02 +0900 (55eeead) @@ -18,8 +18,8 @@ #ifndef GRNXX_LOGGER_HPP #define GRNXX_LOGGER_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" #define GRNXX_ERROR() GRNXX_LOGGER(::grnxx::ERROR_LOGGER) #define GRNXX_WARNING() GRNXX_LOGGER(::grnxx::WARNING_LOGGER) Renamed: lib/grnxx/map.cpp (+5 -5) 96% =================================================================== --- lib/map.cpp 2013-03-22 13:08:07 +0900 (3788ef1) +++ lib/grnxx/map.cpp 2013-03-22 20:18:02 +0900 (6166be2) @@ -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 */ -#include "map.hpp" +#include "grnxx/map.hpp" -#include "charset.hpp" -#include "exception.hpp" -#include "logger.hpp" -#include "map/double_array.hpp" +#include "grnxx/charset.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/map/double_array.hpp" namespace grnxx { Renamed: lib/grnxx/map.hpp (+2 -2) 99% =================================================================== --- lib/map.hpp 2013-03-22 13:08:07 +0900 (9c3de3e) +++ lib/grnxx/map.hpp 2013-03-22 20:18:02 +0900 (04284f5) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_HPP #define GRNXX_MAP_HPP -#include "io/pool.hpp" -#include "slice.hpp" +#include "grnxx/io/pool.hpp" +#include "grnxx/slice.hpp" namespace grnxx { Renamed: lib/grnxx/map/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/map/da/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/map/da/basic/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/map/da/basic/id_cursor.cpp (+3 -3) 94% =================================================================== --- lib/map/da/basic/id_cursor.cpp 2013-03-22 13:08:07 +0900 (006a9e3) +++ lib/grnxx/map/da/basic/id_cursor.cpp 2013-03-22 20:18:02 +0900 (8350139) @@ -1,7 +1,7 @@ -#include "map/da/basic/id_cursor.hpp" +#include "grnxx/map/da/basic/id_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/id_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/basic/id_cursor.hpp 2013-03-22 13:08:07 +0900 (212275f) +++ lib/grnxx/map/da/basic/id_cursor.hpp 2013-03-22 20:18:02 +0900 (938240b) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_BASIC_ID_CURSOR_HPP #define GRNXX_MAP_DA_BASIC_ID_CURSOR_HPP -#include "map/da/basic/trie.hpp" +#include "grnxx/map/da/basic/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/key_cursor.cpp (+3 -3) 98% =================================================================== --- lib/map/da/basic/key_cursor.cpp 2013-03-22 13:08:07 +0900 (040a16e) +++ lib/grnxx/map/da/basic/key_cursor.cpp 2013-03-22 20:18:02 +0900 (507ea48) @@ -1,7 +1,7 @@ -#include "map/da/basic/key_cursor.hpp" +#include "grnxx/map/da/basic/key_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/key_cursor.hpp (+2 -2) 96% =================================================================== --- lib/map/da/basic/key_cursor.hpp 2013-03-22 13:08:07 +0900 (8078a3d) +++ lib/grnxx/map/da/basic/key_cursor.hpp 2013-03-22 20:18:02 +0900 (307e2b8) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DA_BASIC_KEY_CURSOR_HPP #define GRNXX_MAP_DA_BASIC_KEY_CURSOR_HPP -#include "map/da/basic/trie.hpp" -#include "string.hpp" +#include "grnxx/map/da/basic/trie.hpp" +#include "grnxx/string.hpp" #include <vector> Renamed: lib/grnxx/map/da/basic/predictive_cursor.cpp (+3 -3) 97% =================================================================== --- lib/map/da/basic/predictive_cursor.cpp 2013-03-22 13:08:07 +0900 (503cd13) +++ lib/grnxx/map/da/basic/predictive_cursor.cpp 2013-03-22 20:18:02 +0900 (fd9734e) @@ -1,7 +1,7 @@ -#include "map/da/basic/predictive_cursor.hpp" +#include "grnxx/map/da/basic/predictive_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/predictive_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/basic/predictive_cursor.hpp 2013-03-22 13:08:07 +0900 (bc3710a) +++ lib/grnxx/map/da/basic/predictive_cursor.hpp 2013-03-22 20:18:02 +0900 (d6096db) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_BASIC_PREDICTIVE_CURSOR_HPP #define GRNXX_MAP_DA_BASIC_PREDICTIVE_CURSOR_HPP -#include "map/da/basic/trie.hpp" +#include "grnxx/map/da/basic/trie.hpp" #include <vector> Renamed: lib/grnxx/map/da/basic/prefix_cursor.cpp (+3 -3) 96% =================================================================== --- lib/map/da/basic/prefix_cursor.cpp 2013-03-22 13:08:07 +0900 (c60f75c) +++ lib/grnxx/map/da/basic/prefix_cursor.cpp 2013-03-22 20:18:02 +0900 (32b37b5) @@ -1,7 +1,7 @@ -#include "map/da/basic/prefix_cursor.hpp" +#include "grnxx/map/da/basic/prefix_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/prefix_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/basic/prefix_cursor.hpp 2013-03-22 13:08:07 +0900 (80f622f) +++ lib/grnxx/map/da/basic/prefix_cursor.hpp 2013-03-22 20:18:02 +0900 (24883eb) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_BASIC_PREFIX_CURSOR_HPP #define GRNXX_MAP_DA_BASIC_PREFIX_CURSOR_HPP -#include "map/da/basic/trie.hpp" +#include "grnxx/map/da/basic/trie.hpp" #include <vector> Renamed: lib/grnxx/map/da/basic/trie.cpp (+9 -9) 99% =================================================================== --- lib/map/da/basic/trie.cpp 2013-03-22 13:08:07 +0900 (fce8877) +++ lib/grnxx/map/da/basic/trie.cpp 2013-03-22 20:18:02 +0900 (65bcc02) @@ -1,12 +1,12 @@ -#include "map/da/basic/trie.hpp" - -#include "lock.hpp" -#include "logger.hpp" -#include "map/da/basic/id_cursor.hpp" -#include "map/da/basic/key_cursor.hpp" -#include "map/da/basic/predictive_cursor.hpp" -#include "map/da/basic/prefix_cursor.hpp" -#include "map/da/large/trie.hpp" +#include "grnxx/map/da/basic/trie.hpp" + +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/map/da/basic/id_cursor.hpp" +#include "grnxx/map/da/basic/key_cursor.hpp" +#include "grnxx/map/da/basic/predictive_cursor.hpp" +#include "grnxx/map/da/basic/prefix_cursor.hpp" +#include "grnxx/map/da/large/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/basic/trie.hpp (+1 -1) 99% =================================================================== --- lib/map/da/basic/trie.hpp 2013-03-22 13:08:07 +0900 (7c110bb) +++ lib/grnxx/map/da/basic/trie.hpp 2013-03-22 20:18:02 +0900 (d63e2f5) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_BASIC_TRIE_HPP #define GRNXX_MAP_DA_BASIC_TRIE_HPP -#include "map/da/trie.hpp" +#include "grnxx/map/da/trie.hpp" #if 0 # define GRNXX_DEBUG_THROW(msg)\ Renamed: lib/grnxx/map/da/large/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/map/da/large/id_cursor.cpp (+3 -3) 94% =================================================================== --- lib/map/da/large/id_cursor.cpp 2013-03-22 13:08:07 +0900 (f1c9e59) +++ lib/grnxx/map/da/large/id_cursor.cpp 2013-03-22 20:18:02 +0900 (987fad7) @@ -1,7 +1,7 @@ -#include "map/da/large/id_cursor.hpp" +#include "grnxx/map/da/large/id_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/id_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/large/id_cursor.hpp 2013-03-22 13:08:07 +0900 (4354999) +++ lib/grnxx/map/da/large/id_cursor.hpp 2013-03-22 20:18:02 +0900 (59538e5) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_LARGE_ID_CURSOR_HPP #define GRNXX_MAP_DA_LARGE_ID_CURSOR_HPP -#include "map/da/large/trie.hpp" +#include "grnxx/map/da/large/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/key_cursor.cpp (+3 -3) 98% =================================================================== --- lib/map/da/large/key_cursor.cpp 2013-03-22 13:08:07 +0900 (8395193) +++ lib/grnxx/map/da/large/key_cursor.cpp 2013-03-22 20:18:02 +0900 (c3a2f2e) @@ -1,7 +1,7 @@ -#include "map/da/large/key_cursor.hpp" +#include "grnxx/map/da/large/key_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/key_cursor.hpp (+2 -2) 96% =================================================================== --- lib/map/da/large/key_cursor.hpp 2013-03-22 13:08:07 +0900 (dedd5a5) +++ lib/grnxx/map/da/large/key_cursor.hpp 2013-03-22 20:18:02 +0900 (fe01c94) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DA_LARGE_KEY_CURSOR_HPP #define GRNXX_MAP_DA_LARGE_KEY_CURSOR_HPP -#include "map/da/large/trie.hpp" -#include "string.hpp" +#include "grnxx/map/da/large/trie.hpp" +#include "grnxx/string.hpp" #include <vector> Renamed: lib/grnxx/map/da/large/predictive_cursor.cpp (+3 -3) 97% =================================================================== --- lib/map/da/large/predictive_cursor.cpp 2013-03-22 13:08:07 +0900 (5202f76) +++ lib/grnxx/map/da/large/predictive_cursor.cpp 2013-03-22 20:18:02 +0900 (8d2816f) @@ -1,7 +1,7 @@ -#include "map/da/large/predictive_cursor.hpp" +#include "grnxx/map/da/large/predictive_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/predictive_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/large/predictive_cursor.hpp 2013-03-22 13:08:07 +0900 (423f215) +++ lib/grnxx/map/da/large/predictive_cursor.hpp 2013-03-22 20:18:02 +0900 (472fa4c) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_LARGE_PREDICTIVE_CURSOR_HPP #define GRNXX_MAP_DA_LARGE_PREDICTIVE_CURSOR_HPP -#include "map/da/large/trie.hpp" +#include "grnxx/map/da/large/trie.hpp" #include <vector> Renamed: lib/grnxx/map/da/large/prefix_cursor.cpp (+3 -3) 96% =================================================================== --- lib/map/da/large/prefix_cursor.cpp 2013-03-22 13:08:07 +0900 (8a2e642) +++ lib/grnxx/map/da/large/prefix_cursor.cpp 2013-03-22 20:18:02 +0900 (fefc1c9) @@ -1,7 +1,7 @@ -#include "map/da/large/prefix_cursor.hpp" +#include "grnxx/map/da/large/prefix_cursor.hpp" -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/prefix_cursor.hpp (+1 -1) 97% =================================================================== --- lib/map/da/large/prefix_cursor.hpp 2013-03-22 13:08:07 +0900 (02d7fbf) +++ lib/grnxx/map/da/large/prefix_cursor.hpp 2013-03-22 20:18:02 +0900 (3d7afcd) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_LARGE_PREFIX_CURSOR_HPP #define GRNXX_MAP_DA_LARGE_PREFIX_CURSOR_HPP -#include "map/da/large/trie.hpp" +#include "grnxx/map/da/large/trie.hpp" #include <vector> Renamed: lib/grnxx/map/da/large/trie.cpp (+8 -8) 99% =================================================================== --- lib/map/da/large/trie.cpp 2013-03-22 13:08:07 +0900 (b9e61f8) +++ lib/grnxx/map/da/large/trie.cpp 2013-03-22 20:18:02 +0900 (cd98826) @@ -1,11 +1,11 @@ -#include "map/da/large/trie.hpp" - -#include "lock.hpp" -#include "logger.hpp" -#include "map/da/large/id_cursor.hpp" -#include "map/da/large/key_cursor.hpp" -#include "map/da/large/predictive_cursor.hpp" -#include "map/da/large/prefix_cursor.hpp" +#include "grnxx/map/da/large/trie.hpp" + +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/map/da/large/id_cursor.hpp" +#include "grnxx/map/da/large/key_cursor.hpp" +#include "grnxx/map/da/large/predictive_cursor.hpp" +#include "grnxx/map/da/large/prefix_cursor.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/large/trie.hpp (+1 -1) 99% =================================================================== --- lib/map/da/large/trie.hpp 2013-03-22 13:08:07 +0900 (ce80699) +++ lib/grnxx/map/da/large/trie.hpp 2013-03-22 20:18:02 +0900 (dffa58d) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_LARGE_TRIE_HPP #define GRNXX_MAP_DA_LARGE_TRIE_HPP -#include "map/da/basic/trie.hpp" +#include "grnxx/map/da/basic/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/trie.cpp (+4 -4) 91% =================================================================== --- lib/map/da/trie.cpp 2013-03-22 13:08:07 +0900 (d907662) +++ lib/grnxx/map/da/trie.cpp 2013-03-22 20:18:02 +0900 (08e4173) @@ -1,8 +1,8 @@ -#include "map/da/trie.hpp" +#include "grnxx/map/da/trie.hpp" -#include "logger.hpp" -#include "map/da/basic/trie.hpp" -#include "map/da/large/trie.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/map/da/basic/trie.hpp" +#include "grnxx/map/da/large/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/da/trie.hpp (+2 -2) 98% =================================================================== --- lib/map/da/trie.hpp 2013-03-22 13:08:07 +0900 (ac4b6ed) +++ lib/grnxx/map/da/trie.hpp 2013-03-22 20:18:02 +0900 (c1eea54) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DA_TRIE_HPP #define GRNXX_MAP_DA_TRIE_HPP -#include "exception.hpp" -#include "map.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/map.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/double_array.cpp (+4 -4) 98% =================================================================== --- lib/map/double_array.cpp 2013-03-22 13:08:07 +0900 (5ed2f92) +++ lib/grnxx/map/double_array.cpp 2013-03-22 20:18:02 +0900 (c5f3751) @@ -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 */ -#include "map/double_array.hpp" +#include "grnxx/map/double_array.hpp" -#include "exception.hpp" -#include "lock.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/map/double_array.hpp (+2 -2) 98% =================================================================== --- lib/map/double_array.hpp 2013-03-22 13:08:07 +0900 (e384ca3) +++ lib/grnxx/map/double_array.hpp 2013-03-22 20:18:02 +0900 (84d178f) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DOUBLE_ARRAY_HPP #define GRNXX_MAP_DOUBLE_ARRAY_HPP -#include "map.hpp" -#include "map/da/trie.hpp" +#include "grnxx/map.hpp" +#include "grnxx/map/da/trie.hpp" namespace grnxx { namespace map { Renamed: lib/grnxx/mutex.cpp (+3 -3) 95% =================================================================== --- lib/mutex.cpp 2013-03-22 13:08:07 +0900 (e10eed1) +++ lib/grnxx/mutex.cpp 2013-03-22 20:18:02 +0900 (3874823) @@ -15,10 +15,10 @@ 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 "mutex.hpp" +#include "grnxx/mutex.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" namespace grnxx { Renamed: lib/grnxx/mutex.hpp (+3 -3) 96% =================================================================== --- lib/mutex.hpp 2013-03-22 13:08:07 +0900 (0e113f2) +++ lib/grnxx/mutex.hpp 2013-03-22 20:18:02 +0900 (46605c9) @@ -18,9 +18,9 @@ #ifndef GRNXX_MUTEX_HPP #define GRNXX_MUTEX_HPP -#include "basic.hpp" -#include "intrinsic.hpp" -#include "time/duration.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/intrinsic.hpp" +#include "grnxx/time/duration.hpp" namespace grnxx { Renamed: lib/grnxx/os.cpp (+5 -5) 92% =================================================================== --- lib/os.cpp 2013-03-22 13:08:07 +0900 (f20b3b1) +++ lib/grnxx/os.cpp 2013-03-22 20:18:02 +0900 (8b66c9f) @@ -15,15 +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 */ -#include "os.hpp" +#include "grnxx/os.hpp" #include <cstdlib> #include <cerrno> -#include "error.hpp" -#include "exception.hpp" -#include "lock.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" namespace grnxx { Renamed: lib/grnxx/os.hpp (+2 -2) 95% =================================================================== --- lib/os.hpp 2013-03-22 13:08:07 +0900 (7ba4ea2) +++ lib/grnxx/os.hpp 2013-03-22 20:18:02 +0900 (53cf493) @@ -18,8 +18,8 @@ #ifndef GRNXX_OS_HPP #define GRNXX_OS_HPP -#include "basic.hpp" -#include "string.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string.hpp" namespace grnxx { Renamed: lib/grnxx/recycler.cpp (+2 -2) 98% =================================================================== --- lib/recycler.cpp 2013-03-22 13:08:07 +0900 (9959b85) +++ lib/grnxx/recycler.cpp 2013-03-22 20:18:02 +0900 (2b7bf81) @@ -15,9 +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 "recycler.hpp" +#include "grnxx/recycler.hpp" -#include "time/system_clock.hpp" +#include "grnxx/time/system_clock.hpp" namespace grnxx { Renamed: lib/grnxx/recycler.hpp (+1 -1) 99% =================================================================== --- lib/recycler.hpp 2013-03-22 13:08:07 +0900 (d14da6d) +++ lib/grnxx/recycler.hpp 2013-03-22 20:18:02 +0900 (16547c4) @@ -18,7 +18,7 @@ #ifndef GRNXX_RECYCLER_HPP #define GRNXX_RECYCLER_HPP -#include "time/time.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { Renamed: lib/grnxx/slice.cpp (+1 -1) 97% =================================================================== --- lib/slice.cpp 2013-03-22 13:08:07 +0900 (2375678) +++ lib/grnxx/slice.cpp 2013-03-22 20:18:02 +0900 (67d7d4c) @@ -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 "slice.hpp" +#include "grnxx/slice.hpp" #include <iostream> Renamed: lib/grnxx/slice.hpp (+1 -1) 99% =================================================================== --- lib/slice.hpp 2013-03-22 13:08:07 +0900 (0c4498c) +++ lib/grnxx/slice.hpp 2013-03-22 20:18:02 +0900 (e692711) @@ -18,7 +18,7 @@ #ifndef GRNXX_SLICE_HPP #define GRNXX_SLICE_HPP -#include "basic.hpp" +#include "grnxx/basic.hpp" namespace grnxx { Renamed: lib/grnxx/storage.cpp (+1 -1) 98% =================================================================== --- lib/storage.cpp 2013-03-22 13:08:07 +0900 (ce67f41) +++ lib/grnxx/storage.cpp 2013-03-22 20:18:02 +0900 (91adb28) @@ -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 "storage.hpp" +#include "grnxx/storage.hpp" #include <ostream> Renamed: lib/grnxx/storage.hpp (+2 -2) 99% =================================================================== --- lib/storage.hpp 2013-03-22 13:08:07 +0900 (2fe61cd) +++ lib/grnxx/storage.hpp 2013-03-22 20:18:02 +0900 (3fb7fb3) @@ -18,8 +18,8 @@ #ifndef GRNXX_STORAGE_HPP #define GRNXX_STORAGE_HPP -#include "basic.hpp" -#include "time/time.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { Renamed: lib/grnxx/string.cpp (+3 -3) 96% =================================================================== --- lib/string.cpp 2013-03-22 13:08:07 +0900 (d9a7af1) +++ lib/grnxx/string.cpp 2013-03-22 20:18:02 +0900 (2ea478d) @@ -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 */ -#include "string.hpp" +#include "grnxx/string.hpp" #include <ostream> -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" namespace grnxx { Renamed: lib/grnxx/string.hpp (+2 -2) 98% =================================================================== --- lib/string.hpp 2013-03-22 13:08:07 +0900 (29a2d6c) +++ lib/grnxx/string.hpp 2013-03-22 20:18:02 +0900 (a9301b4) @@ -18,8 +18,8 @@ #ifndef GRNXX_STRING_HPP #define GRNXX_STRING_HPP -#include "basic.hpp" -#include "intrinsic.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/intrinsic.hpp" namespace grnxx { Renamed: lib/grnxx/string_builder.cpp (+1 -1) 99% =================================================================== --- lib/string_builder.cpp 2013-03-22 13:08:07 +0900 (b6fdbe3) +++ lib/grnxx/string_builder.cpp 2013-03-22 20:18:02 +0900 (1f3a360) @@ -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 "string_builder.hpp" +#include "grnxx/string_builder.hpp" #include <cmath> #include <ostream> Renamed: lib/grnxx/string_builder.hpp (+3 -3) 98% =================================================================== --- lib/string_builder.hpp 2013-03-22 13:08:07 +0900 (b66011e) +++ lib/grnxx/string_builder.hpp 2013-03-22 20:18:02 +0900 (56a6ce2) @@ -18,9 +18,9 @@ #ifndef GRNXX_STRING_BUILDER_HPP #define GRNXX_STRING_BUILDER_HPP -#include "basic.hpp" -#include "flags_impl.hpp" -#include "string.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/flags_impl.hpp" +#include "grnxx/string.hpp" namespace grnxx { Renamed: lib/grnxx/string_format.hpp (+2 -2) 98% =================================================================== --- lib/string_format.hpp 2013-03-22 13:08:07 +0900 (94ae972) +++ lib/grnxx/string_format.hpp 2013-03-22 20:18:02 +0900 (07ac5a8) @@ -18,8 +18,8 @@ #ifndef GRNXX_STRING_FORMAT_HPP #define GRNXX_STRING_FORMAT_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { Renamed: lib/grnxx/thread.cpp (+1 -1) 97% =================================================================== --- lib/thread.cpp 2013-03-22 13:08:07 +0900 (232f6c4) +++ lib/grnxx/thread.cpp 2013-03-22 20:18:02 +0900 (0ffab84) @@ -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 "thread.hpp" +#include "grnxx/thread.hpp" #include <chrono> #include <thread> Renamed: lib/grnxx/thread.hpp (+2 -2) 94% =================================================================== --- lib/thread.hpp 2013-03-22 13:08:07 +0900 (c860998) +++ lib/grnxx/thread.hpp 2013-03-22 20:18:02 +0900 (de7e851) @@ -18,8 +18,8 @@ #ifndef GRNXX_THREAD_HPP #define GRNXX_THREAD_HPP -#include "basic.hpp" -#include "time/time.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { Renamed: lib/grnxx/time/Makefile.am (+0 -0) 100% =================================================================== Renamed: lib/grnxx/time/broken_down_time.cpp (+2 -2) 95% =================================================================== --- lib/time/broken_down_time.cpp 2013-03-22 13:08:07 +0900 (cf2eaf6) +++ lib/grnxx/time/broken_down_time.cpp 2013-03-22 20:18:02 +0900 (f562f2b) @@ -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 */ -#include "time/broken_down_time.hpp" +#include "grnxx/time/broken_down_time.hpp" #include <iostream> -#include "string_format.hpp" +#include "grnxx/string_format.hpp" namespace grnxx { Renamed: lib/grnxx/time/broken_down_time.hpp (+2 -2) 96% =================================================================== --- lib/time/broken_down_time.hpp 2013-03-22 13:08:07 +0900 (8c88d67) +++ lib/grnxx/time/broken_down_time.hpp 2013-03-22 20:18:02 +0900 (34be16c) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_BROKEN_DOWN_TIME_HPP #define GRNXX_TIME_BROKEN_DOWN_TIME_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { Renamed: lib/grnxx/time/duration.cpp (+2 -2) 95% =================================================================== --- lib/time/duration.cpp 2013-03-22 13:08:07 +0900 (073da33) +++ lib/grnxx/time/duration.cpp 2013-03-22 20:18:02 +0900 (6bb99f7) @@ -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 */ -#include "time/duration.hpp" +#include "grnxx/time/duration.hpp" #include <ostream> -#include "string_format.hpp" +#include "grnxx/string_format.hpp" namespace grnxx { Renamed: lib/grnxx/time/duration.hpp (+2 -2) 98% =================================================================== --- lib/time/duration.hpp 2013-03-22 13:08:07 +0900 (d24ae87) +++ lib/grnxx/time/duration.hpp 2013-03-22 20:18:02 +0900 (eeb587d) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_DURATION_HPP #define GRNXX_TIME_DURATION_HPP -#include "basic.hpp" -#include "string_builder.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/string_builder.hpp" namespace grnxx { Renamed: lib/grnxx/time/internal_clock.cpp (+6 -6) 92% =================================================================== --- lib/time/internal_clock.cpp 2013-03-22 13:08:07 +0900 (f10c8b9) +++ lib/grnxx/time/internal_clock.cpp 2013-03-22 20:18:02 +0900 (719b2c0) @@ -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/internal_clock.hpp" +#include "grnxx/time/internal_clock.hpp" #include "../config.h" @@ -25,11 +25,11 @@ #include <thread> -#include "error.hpp" -#include "lock.hpp" -#include "logger.hpp" -#include "thread.hpp" -#include "time/system_clock.hpp" +#include "grnxx/error.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/system_clock.hpp" namespace grnxx { namespace { Renamed: lib/grnxx/time/internal_clock.hpp (+2 -2) 95% =================================================================== --- lib/time/internal_clock.hpp 2013-03-22 13:08:07 +0900 (9251494) +++ lib/grnxx/time/internal_clock.hpp 2013-03-22 20:18:02 +0900 (c8dd74b) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_INTERNAL_CLOCK_HPP #define GRNXX_TIME_INTERNAL_CLOCK_HPP -#include "basic.hpp" -#include "time/time.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { Renamed: lib/grnxx/time/periodic_clock.cpp (+1 -1) 95% =================================================================== --- lib/time/periodic_clock.cpp 2013-03-22 13:08:07 +0900 (af5e22c) +++ lib/grnxx/time/periodic_clock.cpp 2013-03-22 20:18:02 +0900 (9b63257) @@ -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/periodic_clock.hpp" +#include "grnxx/time/periodic_clock.hpp" namespace grnxx { namespace { Renamed: lib/grnxx/time/periodic_clock.hpp (+2 -2) 94% =================================================================== --- lib/time/periodic_clock.hpp 2013-03-22 13:08:07 +0900 (3823a7c) +++ lib/grnxx/time/periodic_clock.hpp 2013-03-22 20:18:02 +0900 (556e07e) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_PERIODIC_CLOCK_HPP #define GRNXX_TIME_PERIODIC_CLOCK_HPP -#include "basic.hpp" -#include "time/system_clock.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/system_clock.hpp" namespace grnxx { Renamed: lib/grnxx/time/stopwatch.cpp (+1 -1) 97% =================================================================== --- lib/time/stopwatch.cpp 2013-03-22 13:08:07 +0900 (046c88a) +++ lib/grnxx/time/stopwatch.cpp 2013-03-22 20:18:02 +0900 (a4089f1) @@ -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/stopwatch.hpp" +#include "grnxx/time/stopwatch.hpp" #include <chrono> Renamed: lib/grnxx/time/stopwatch.hpp (+2 -2) 96% =================================================================== --- lib/time/stopwatch.hpp 2013-03-22 13:08:07 +0900 (dbee7ae) +++ lib/grnxx/time/stopwatch.hpp 2013-03-22 20:18:02 +0900 (de7bc00) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_STOPWATCH_HPP #define GRNXX_TIME_STOPWATCH_HPP -#include "basic.hpp" -#include "time/duration.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/duration.hpp" namespace grnxx { Renamed: lib/grnxx/time/system_clock.cpp (+1 -1) 96% =================================================================== --- lib/time/system_clock.cpp 2013-03-22 13:08:07 +0900 (be1f8ba) +++ lib/grnxx/time/system_clock.cpp 2013-03-22 20:18:02 +0900 (79b4dc7) @@ -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/system_clock.hpp" +#include "grnxx/time/system_clock.hpp" #include <chrono> Renamed: lib/grnxx/time/system_clock.hpp (+2 -2) 94% =================================================================== --- lib/time/system_clock.hpp 2013-03-22 13:08:07 +0900 (e6cba9e) +++ lib/grnxx/time/system_clock.hpp 2013-03-22 20:18:02 +0900 (8f84914) @@ -18,8 +18,8 @@ #ifndef GRNXX_TIME_SYSTEM_CLOCK_HPP #define GRNXX_TIME_SYSTEM_CLOCK_HPP -#include "basic.hpp" -#include "time/time.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/time.hpp" namespace grnxx { Renamed: lib/grnxx/time/time.cpp (+3 -3) 97% =================================================================== --- lib/time/time.cpp 2013-03-22 13:08:07 +0900 (569722d) +++ lib/grnxx/time/time.cpp 2013-03-22 20:18:02 +0900 (eb46300) @@ -15,13 +15,13 @@ 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/time.hpp" +#include "grnxx/time/time.hpp" #include <ctime> #include <ostream> -#include "lock.hpp" -#include "string_format.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/string_format.hpp" namespace grnxx { namespace { Renamed: lib/grnxx/time/time.hpp (+3 -3) 96% =================================================================== --- lib/time/time.hpp 2013-03-22 13:08:07 +0900 (d81e775) +++ lib/grnxx/time/time.hpp 2013-03-22 20:18:02 +0900 (b4e82bd) @@ -18,9 +18,9 @@ #ifndef GRNXX_TIME_TIME_HPP #define GRNXX_TIME_TIME_HPP -#include "basic.hpp" -#include "time/broken_down_time.hpp" -#include "time/duration.hpp" +#include "grnxx/basic.hpp" +#include "grnxx/time/broken_down_time.hpp" +#include "grnxx/time/duration.hpp" namespace grnxx { Renamed: lib/grnxx/version.sh (+0 -0) 100% =================================================================== Modified: src/Makefile.am (+1 -1) =================================================================== --- src/Makefile.am 2013-03-22 13:08:07 +0900 (a4f0064) +++ src/Makefile.am 2013-03-22 20:18:02 +0900 (66f4aca) @@ -3,4 +3,4 @@ AM_CXXFLAGS = @AM_CXXFLAGS@ -I$(top_srcdir)/lib bin_PROGRAMS = grnxx grnxx_SOURCES = grnxx.cpp -grnxx_LDADD = ../lib/libgrnxx.la +grnxx_LDADD = ../lib/grnxx/libgrnxx.la Modified: src/grnxx.cpp (+1 -1) =================================================================== --- src/grnxx.cpp 2013-03-22 13:08:07 +0900 (9d66b5f) +++ src/grnxx.cpp 2013-03-22 20:18:02 +0900 (9dda218) @@ -3,7 +3,7 @@ #include <iostream> -#include "grnxx.hpp" +#include "grnxx/grnxx.hpp" namespace { Modified: test/Makefile.am (+33 -33) =================================================================== --- test/Makefile.am 2013-03-22 13:08:07 +0900 (023c9ad) +++ test/Makefile.am 2013-03-22 20:18:02 +0900 (80e291a) @@ -38,100 +38,100 @@ TESTS = \ check_PROGRAMS = $(TESTS) test_alpha_double_array_SOURCES = test_alpha_double_array.cpp -test_alpha_double_array_LDADD = ../lib/libgrnxx.la +test_alpha_double_array_LDADD = ../lib/grnxx/libgrnxx.la test_backtrace_SOURCES = test_backtrace.cpp -test_backtrace_LDADD = ../lib/libgrnxx.la +test_backtrace_LDADD = ../lib/grnxx/libgrnxx.la test_broken_down_time_SOURCES = test_broken_down_time.cpp -test_broken_down_time_LDADD = ../lib/libgrnxx.la +test_broken_down_time_LDADD = ../lib/grnxx/libgrnxx.la test_charset_SOURCES = test_charset.cpp -test_charset_LDADD = ../lib/libgrnxx.la +test_charset_LDADD = ../lib/grnxx/libgrnxx.la test_db_blob_vector_SOURCES = test_db_blob_vector.cpp -test_db_blob_vector_LDADD = ../lib/libgrnxx.la +test_db_blob_vector_LDADD = ../lib/grnxx/libgrnxx.la test_db_vector_SOURCES = test_db_vector.cpp -test_db_vector_LDADD = ../lib/libgrnxx.la +test_db_vector_LDADD = ../lib/grnxx/libgrnxx.la test_duration_SOURCES = test_duration.cpp -test_duration_LDADD = ../lib/libgrnxx.la +test_duration_LDADD = ../lib/grnxx/libgrnxx.la test_error_SOURCES = test_error.cpp -test_error_LDADD = ../lib/libgrnxx.la +test_error_LDADD = ../lib/grnxx/libgrnxx.la test_exception_SOURCES = test_exception.cpp -test_exception_LDADD = ../lib/libgrnxx.la +test_exception_LDADD = ../lib/grnxx/libgrnxx.la test_features_SOURCES = test_features.cpp -test_features_LDADD = ../lib/libgrnxx.la +test_features_LDADD = ../lib/grnxx/libgrnxx.la test_grnxx_SOURCES = test_grnxx.cpp -test_grnxx_LDADD = ../lib/libgrnxx.la +test_grnxx_LDADD = ../lib/grnxx/libgrnxx.la test_internal_clock_SOURCES = test_internal_clock.cpp -test_internal_clock_LDADD = ../lib/libgrnxx.la +test_internal_clock_LDADD = ../lib/grnxx/libgrnxx.la test_intrinsic_SOURCES = test_intrinsic.cpp -test_intrinsic_LDADD = ../lib/libgrnxx.la +test_intrinsic_LDADD = ../lib/grnxx/libgrnxx.la test_io_file_SOURCES = test_io_file.cpp -test_io_file_LDADD = ../lib/libgrnxx.la +test_io_file_LDADD = ../lib/grnxx/libgrnxx.la test_io_file_info_SOURCES = test_io_file_info.cpp -test_io_file_info_LDADD = ../lib/libgrnxx.la +test_io_file_info_LDADD = ../lib/grnxx/libgrnxx.la test_io_path_SOURCES = test_io_path.cpp -test_io_path_LDADD = ../lib/libgrnxx.la +test_io_path_LDADD = ../lib/grnxx/libgrnxx.la test_io_pool_SOURCES = test_io_pool.cpp -test_io_pool_LDADD = ../lib/libgrnxx.la +test_io_pool_LDADD = ../lib/grnxx/libgrnxx.la test_io_view_SOURCES = test_io_view.cpp -test_io_view_LDADD = ../lib/libgrnxx.la +test_io_view_LDADD = ../lib/grnxx/libgrnxx.la test_logger_SOURCES = test_logger.cpp -test_logger_LDADD = ../lib/libgrnxx.la +test_logger_LDADD = ../lib/grnxx/libgrnxx.la test_map_SOURCES = test_map.cpp -test_map_LDADD = ../lib/libgrnxx.la +test_map_LDADD = ../lib/grnxx/libgrnxx.la test_map_double_array_SOURCES = test_map_double_array.cpp -test_map_double_array_LDADD = ../lib/libgrnxx.la +test_map_double_array_LDADD = ../lib/grnxx/libgrnxx.la test_map_da_basic_trie_SOURCES = test_map_da_basic_trie.cpp -test_map_da_basic_trie_LDADD = ../lib/libgrnxx.la +test_map_da_basic_trie_LDADD = ../lib/grnxx/libgrnxx.la test_map_da_large_trie_SOURCES = test_map_da_large_trie.cpp -test_map_da_large_trie_LDADD = ../lib/libgrnxx.la +test_map_da_large_trie_LDADD = ../lib/grnxx/libgrnxx.la test_mutex_SOURCES = test_mutex.cpp -test_mutex_LDADD = ../lib/libgrnxx.la +test_mutex_LDADD = ../lib/grnxx/libgrnxx.la test_os_SOURCES = test_os.cpp -test_os_LDADD = ../lib/libgrnxx.la +test_os_LDADD = ../lib/grnxx/libgrnxx.la test_recycler_SOURCES = test_recycler.cpp -test_recycler_LDADD = ../lib/libgrnxx.la +test_recycler_LDADD = ../lib/grnxx/libgrnxx.la test_slice_SOURCES = test_slice.cpp -test_slice_LDADD = ../lib/libgrnxx.la +test_slice_LDADD = ../lib/grnxx/libgrnxx.la test_stopwatch_SOURCES = test_stopwatch.cpp -test_stopwatch_LDADD = ../lib/libgrnxx.la +test_stopwatch_LDADD = ../lib/grnxx/libgrnxx.la test_string_SOURCES = test_string.cpp -test_string_LDADD = ../lib/libgrnxx.la +test_string_LDADD = ../lib/grnxx/libgrnxx.la test_string_builder_SOURCES = test_string_builder.cpp -test_string_builder_LDADD = ../lib/libgrnxx.la +test_string_builder_LDADD = ../lib/grnxx/libgrnxx.la test_string_format_SOURCES = test_string_format.cpp -test_string_format_LDADD = ../lib/libgrnxx.la +test_string_format_LDADD = ../lib/grnxx/libgrnxx.la test_thread_SOURCES = test_thread.cpp -test_thread_LDADD = ../lib/libgrnxx.la +test_thread_LDADD = ../lib/grnxx/libgrnxx.la test_time_SOURCES = test_time.cpp -test_time_LDADD = ../lib/libgrnxx.la +test_time_LDADD = ../lib/grnxx/libgrnxx.la Modified: test/test_alpha_double_array.cpp (+3 -3) =================================================================== --- test/test_alpha_double_array.cpp 2013-03-22 13:08:07 +0900 (bdbe3d0) +++ test/test_alpha_double_array.cpp 2013-03-22 20:18:02 +0900 (01ea1c3) @@ -21,9 +21,9 @@ #include <unordered_set> #include <vector> -#include "alpha/double_array.hpp" -#include "logger.hpp" -#include "time/time.hpp" +#include "grnxx/alpha/double_array.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_backtrace.cpp (+2 -2) =================================================================== --- test/test_backtrace.cpp 2013-03-22 13:08:07 +0900 (f661699) +++ test/test_backtrace.cpp 2013-03-22 20:18:02 +0900 (e3e883b) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "backtrace.hpp" -#include "logger.hpp" +#include "grnxx/backtrace.hpp" +#include "grnxx/logger.hpp" void function_3rd() { GRNXX_NOTICE() << __FUNCTION__ << "()"; Modified: test/test_broken_down_time.cpp (+3 -3) =================================================================== --- test/test_broken_down_time.cpp 2013-03-22 13:08:07 +0900 (61b7955) +++ test/test_broken_down_time.cpp 2013-03-22 20:18:02 +0900 (400f760) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "time/stopwatch.hpp" -#include "time/system_clock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" +#include "grnxx/time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_charset.cpp (+2 -2) =================================================================== --- test/test_charset.cpp 2013-03-22 13:08:07 +0900 (b852869) +++ test/test_charset.cpp 2013-03-22 20:18:02 +0900 (83054d8) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "logger.hpp" -#include "charset.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/charset.hpp" void test_ascii() { const grnxx::Slice query = "Hello, world!"; Modified: test/test_db_blob_vector.cpp (+3 -3) =================================================================== --- test/test_db_blob_vector.cpp 2013-03-22 13:08:07 +0900 (18d25e1) +++ test/test_db_blob_vector.cpp 2013-03-22 20:18:02 +0900 (d374892) @@ -20,9 +20,9 @@ #include <random> #include <vector> -#include "db/blob_vector.hpp" -#include "logger.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/db/blob_vector.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" void test_basics() { grnxx::io::Pool::unlink_if_exists("temp.grn"); Modified: test/test_db_vector.cpp (+3 -3) =================================================================== --- test/test_db_vector.cpp 2013-03-22 13:08:07 +0900 (6367cf4) +++ test/test_db_vector.cpp 2013-03-22 20:18:02 +0900 (dc06b45) @@ -20,9 +20,9 @@ #include <random> #include <vector> -#include "db/vector.hpp" -#include "logger.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/db/vector.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" struct Point { double x; Modified: test/test_duration.cpp (+2 -2) =================================================================== --- test/test_duration.cpp 2013-03-22 13:08:07 +0900 (552dd69) +++ test/test_duration.cpp 2013-03-22 20:18:02 +0900 (29513e4) @@ -18,8 +18,8 @@ #include <cassert> #include <sstream> -#include "logger.hpp" -#include "time/duration.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/duration.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_error.cpp (+2 -2) =================================================================== --- test/test_error.cpp 2013-03-22 13:08:07 +0900 (b5ed3e2) +++ test/test_error.cpp 2013-03-22 20:18:02 +0900 (1d14176) @@ -18,8 +18,8 @@ #include <cassert> #include <cerrno> -#include "error.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/logger.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_exception.cpp (+2 -2) =================================================================== --- test/test_exception.cpp 2013-03-22 13:08:07 +0900 (59d397d) +++ test/test_exception.cpp 2013-03-22 20:18:02 +0900 (0a4a48f) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "exception.hpp" -#include "logger.hpp" +#include "grnxx/exception.hpp" +#include "grnxx/logger.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_features.cpp (+1 -1) =================================================================== --- test/test_features.cpp 2013-03-22 13:08:07 +0900 (a3e40a6) +++ test/test_features.cpp 2013-03-22 20:18:02 +0900 (c4741b9) @@ -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 "features.hpp" +#include "grnxx/features.hpp" int main() { return 0; Modified: test/test_grnxx.cpp (+2 -2) =================================================================== --- test/test_grnxx.cpp 2013-03-22 13:08:07 +0900 (af8097f) +++ test/test_grnxx.cpp 2013-03-22 20:18:02 +0900 (4e6b643) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "grnxx.hpp" -#include "logger.hpp" +#include "grnxx/grnxx.hpp" +#include "grnxx/logger.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_internal_clock.cpp (+4 -4) =================================================================== --- test/test_internal_clock.cpp 2013-03-22 13:08:07 +0900 (0de609d) +++ test/test_internal_clock.cpp 2013-03-22 20:18:02 +0900 (2d64472) @@ -19,10 +19,10 @@ #include <cassert> -#include "logger.hpp" -#include "thread.hpp" -#include "time/internal_clock.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/internal_clock.hpp" +#include "grnxx/time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_intrinsic.cpp (+3 -3) =================================================================== --- test/test_intrinsic.cpp 2013-03-22 13:08:07 +0900 (bbff863) +++ test/test_intrinsic.cpp 2013-03-22 20:18:02 +0900 (4b4a715) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "intrinsic.hpp" -#include "logger.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/intrinsic.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" void test_basics() { assert(grnxx::bit_scan_reverse(std::uint8_t(100)) == 6); Modified: test/test_io_file.cpp (+2 -2) =================================================================== --- test/test_io_file.cpp 2013-03-22 13:08:07 +0900 (1671ea8) +++ test/test_io_file.cpp 2013-03-22 20:18:02 +0900 (8d006ec) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "io/file.hpp" -#include "logger.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/logger.hpp" void test_create() { const char FILE_PATH[] = "temp.grn"; Modified: test/test_io_file_info.cpp (+3 -3) =================================================================== --- test/test_io_file_info.cpp 2013-03-22 13:08:07 +0900 (471e084) +++ test/test_io_file_info.cpp 2013-03-22 20:18:02 +0900 (8890a96) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "io/file.hpp" -#include "io/file_info.hpp" -#include "logger.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/io/file_info.hpp" +#include "grnxx/logger.hpp" void test_non_existent_file() { const char FILE_PATH[] = "temp.grn"; Modified: test/test_io_path.cpp (+2 -2) =================================================================== --- test/test_io_path.cpp 2013-03-22 13:08:07 +0900 (c6d3024) +++ test/test_io_path.cpp 2013-03-22 20:18:02 +0900 (ffa7acf) @@ -18,8 +18,8 @@ #include <cassert> #include <sstream> -#include "io/path.hpp" -#include "logger.hpp" +#include "grnxx/io/path.hpp" +#include "grnxx/logger.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_io_pool.cpp (+3 -3) =================================================================== --- test/test_io_pool.cpp 2013-03-22 13:08:07 +0900 (fc43859) +++ test/test_io_pool.cpp 2013-03-22 20:18:02 +0900 (5be3bf4) @@ -21,9 +21,9 @@ #include <unordered_map> #include <unordered_set> -#include "io/pool.hpp" -#include "logger.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/io/pool.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" void test_constructor() { grnxx::io::Pool::unlink_if_exists("temp.grn"); Modified: test/test_io_view.cpp (+3 -3) =================================================================== --- test/test_io_view.cpp 2013-03-22 13:08:07 +0900 (7241b90) +++ test/test_io_view.cpp 2013-03-22 20:18:02 +0900 (90ccf2a) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "io/file.hpp" -#include "io/view.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/io/file.hpp" +#include "grnxx/io/view.hpp" void test_anonymous_mmap() { const std::uint64_t MMAP_SIZE = 1 << 20; Modified: test/test_logger.cpp (+2 -2) =================================================================== --- test/test_logger.cpp 2013-03-22 13:08:07 +0900 (4789344) +++ test/test_logger.cpp 2013-03-22 20:18:02 +0900 (f7dc66f) @@ -19,8 +19,8 @@ #include <cerrno> #include <cstdio> -#include "error.hpp" -#include "logger.hpp" +#include "grnxx/error.hpp" +#include "grnxx/logger.hpp" //void f3() { // std::cerr << "I'm f3()" << std::endl; Modified: test/test_map.cpp (+4 -4) =================================================================== --- test/test_map.cpp 2013-03-22 13:08:07 +0900 (80556f4) +++ test/test_map.cpp 2013-03-22 20:18:02 +0900 (224d0c9) @@ -21,10 +21,10 @@ #include <unordered_set> #include <vector> -#include "charset.hpp" -#include "map.hpp" -#include "logger.hpp" -#include "time/time.hpp" +#include "grnxx/charset.hpp" +#include "grnxx/map.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_da_basic_trie.cpp (+4 -4) =================================================================== --- test/test_map_da_basic_trie.cpp 2013-03-22 13:08:07 +0900 (cf6ac1b) +++ test/test_map_da_basic_trie.cpp 2013-03-22 20:18:02 +0900 (b0f6b09) @@ -21,10 +21,10 @@ #include <unordered_set> #include <vector> -#include "map/da/basic/id_cursor.hpp" -#include "map/da/basic/trie.hpp" -#include "logger.hpp" -#include "time/time.hpp" +#include "grnxx/map/da/basic/id_cursor.hpp" +#include "grnxx/map/da/basic/trie.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_da_large_trie.cpp (+3 -3) =================================================================== --- test/test_map_da_large_trie.cpp 2013-03-22 13:08:07 +0900 (d7b1d44) +++ test/test_map_da_large_trie.cpp 2013-03-22 20:18:02 +0900 (83bc6f8) @@ -21,9 +21,9 @@ #include <unordered_set> #include <vector> -#include "map/da/large/trie.hpp" -#include "logger.hpp" -#include "time/time.hpp" +#include "grnxx/map/da/large/trie.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_map_double_array.cpp (+3 -3) =================================================================== --- test/test_map_double_array.cpp 2013-03-22 13:08:07 +0900 (40136e6) +++ test/test_map_double_array.cpp 2013-03-22 20:18:02 +0900 (be36128) @@ -21,9 +21,9 @@ #include <unordered_set> #include <vector> -#include "map/double_array.hpp" -#include "logger.hpp" -#include "time/time.hpp" +#include "grnxx/map/double_array.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/time.hpp" void test_basics() { grnxx::io::Pool pool; Modified: test/test_mutex.cpp (+4 -4) =================================================================== --- test/test_mutex.cpp 2013-03-22 13:08:07 +0900 (593836a) +++ test/test_mutex.cpp 2013-03-22 20:18:02 +0900 (77e02c3) @@ -17,10 +17,10 @@ */ #include <cassert> -#include "lock.hpp" -#include "logger.hpp" -#include "mutex.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/lock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/mutex.hpp" +#include "grnxx/time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_os.cpp (+2 -2) =================================================================== --- test/test_os.cpp 2013-03-22 13:08:07 +0900 (1039d70) +++ test/test_os.cpp 2013-03-22 20:18:02 +0900 (2e72db5) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "os.hpp" -#include "logger.hpp" +#include "grnxx/os.hpp" +#include "grnxx/logger.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_recycler.cpp (+3 -3) =================================================================== --- test/test_recycler.cpp 2013-03-22 13:08:07 +0900 (cb89557) +++ test/test_recycler.cpp 2013-03-22 20:18:02 +0900 (a533723) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "recycler.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/recycler.hpp" +#include "grnxx/time/stopwatch.hpp" void test() { const grnxx::Duration FROZEN_DURATION = grnxx::Duration::minutes(10); Modified: test/test_slice.cpp (+2 -2) =================================================================== --- test/test_slice.cpp 2013-03-22 13:08:07 +0900 (d8f9489) +++ test/test_slice.cpp 2013-03-22 20:18:02 +0900 (ca2b5d4) @@ -17,8 +17,8 @@ */ #include <cassert> -#include "logger.hpp" -#include "slice.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/slice.hpp" void test_constructors() { grnxx::Slice slice; Modified: test/test_stopwatch.cpp (+3 -3) =================================================================== --- test/test_stopwatch.cpp 2013-03-22 13:08:07 +0900 (50e0e3d) +++ test/test_stopwatch.cpp 2013-03-22 20:18:02 +0900 (700e230) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_string.cpp (+3 -3) =================================================================== --- test/test_string.cpp 2013-03-22 13:08:07 +0900 (6b46b7d) +++ test/test_string.cpp 2013-03-22 20:18:02 +0900 (329ca37) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "string.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/string.hpp" +#include "grnxx/time/stopwatch.hpp" void test_constructors() { assert(!grnxx::String()); Modified: test/test_string_builder.cpp (+3 -3) =================================================================== --- test/test_string_builder.cpp 2013-03-22 13:08:07 +0900 (d3ac177) +++ test/test_string_builder.cpp 2013-03-22 20:18:02 +0900 (dc9f89a) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "string_builder.hpp" -#include "time/time.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/string_builder.hpp" +#include "grnxx/time/time.hpp" void test_basic_operations() { grnxx::StringBuilder builder; Modified: test/test_string_format.cpp (+3 -3) =================================================================== --- test/test_string_format.cpp 2013-03-22 13:08:07 +0900 (0e3d4f2) +++ test/test_string_format.cpp 2013-03-22 20:18:02 +0900 (3451371) @@ -20,9 +20,9 @@ #include <iostream> #include <sstream> -#include "logger.hpp" -#include "string_format.hpp" -#include "time/stopwatch.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/string_format.hpp" +#include "grnxx/time/stopwatch.hpp" void test_align() { grnxx::StringBuilder builder; Modified: test/test_thread.cpp (+4 -4) =================================================================== --- test/test_thread.cpp 2013-03-22 13:08:07 +0900 (871b274) +++ test/test_thread.cpp 2013-03-22 20:18:02 +0900 (02f2be4) @@ -17,10 +17,10 @@ */ #include <cassert> -#include "logger.hpp" -#include "thread.hpp" -#include "time/stopwatch.hpp" -#include "time/system_clock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/thread.hpp" +#include "grnxx/time/stopwatch.hpp" +#include "grnxx/time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL | Modified: test/test_time.cpp (+3 -3) =================================================================== --- test/test_time.cpp 2013-03-22 13:08:07 +0900 (c997897) +++ test/test_time.cpp 2013-03-22 20:18:02 +0900 (aff19e7) @@ -17,9 +17,9 @@ */ #include <cassert> -#include "logger.hpp" -#include "time/stopwatch.hpp" -#include "time/system_clock.hpp" +#include "grnxx/logger.hpp" +#include "grnxx/time/stopwatch.hpp" +#include "grnxx/time/system_clock.hpp" int main() { grnxx::Logger::set_flags(grnxx::LOGGER_WITH_ALL |
