susumu.yata
null+****@clear*****
Fri Mar 8 16:55:52 JST 2013
susumu.yata 2013-03-08 16:55:52 +0900 (Fri, 08 Mar 2013) New Revision: 17e94ef21439e71f68bf7718cfe7ca8dfc56a14f https://github.com/groonga/grnxx/commit/17e94ef21439e71f68bf7718cfe7ca8dfc56a14f Message: Add ${top_srcdir}/lib to include path. Examples: - Include "logger.hpp" instead of "../logger.hpp". - Include "io/path.hpp" instead of "path.hpp". Modified files: configure.ac lib/alpha/double_array.cpp lib/alpha/double_array.hpp lib/db/blob_vector.cpp lib/db/blob_vector.hpp lib/db/vector.cpp lib/db/vector.hpp lib/io/block.cpp lib/io/block.hpp lib/io/chunk.cpp lib/io/chunk.hpp lib/io/file-posix.cpp lib/io/file-posix.hpp lib/io/file-windows.cpp lib/io/file-windows.hpp lib/io/file.cpp lib/io/file.hpp lib/io/file_info.cpp lib/io/file_info.hpp lib/io/path.cpp lib/io/path.hpp lib/io/pool-impl.cpp lib/io/pool-impl.hpp lib/io/pool.cpp lib/io/pool.hpp lib/io/view-posix.cpp lib/io/view-posix.hpp lib/io/view-windows.cpp lib/io/view-windows.hpp lib/io/view.cpp lib/io/view.hpp lib/map/da/basic_trie.cpp lib/map/da/basic_trie.hpp lib/map/da/large_trie.cpp lib/map/da/large_trie.hpp lib/map/da/trie.cpp lib/map/da/trie.hpp lib/map/double_array.cpp lib/map/double_array.hpp test/Makefile.am Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2013-03-08 16:21:07 +0900 (1709e6a) +++ configure.ac 2013-03-08 16:55:52 +0900 (884be59) @@ -14,7 +14,7 @@ AC_PROG_INSTALL AC_CONFIG_MACRO_DIR([m4]) -AM_CXXFLAGS="-Wall -Wextra -std=c++11 -fno-strict-aliasing" +AM_CXXFLAGS="-Wall -Wextra -std=c++11 -fno-strict-aliasing -I\${top_srcdir}/lib" AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_LTLDFLAGS]) Modified: lib/alpha/double_array.cpp (+4 -4) =================================================================== --- lib/alpha/double_array.cpp 2013-03-08 16:21:07 +0900 (6e0ec80) +++ lib/alpha/double_array.cpp 2013-03-08 16:55:52 +0900 (2fb377a) @@ -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 "double_array.hpp" +#include "alpha/double_array.hpp" -#include "../exception.hpp" -#include "../lock.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "lock.hpp" +#include "logger.hpp" namespace grnxx { namespace alpha { Modified: lib/alpha/double_array.hpp (+1 -1) =================================================================== --- lib/alpha/double_array.hpp 2013-03-08 16:21:07 +0900 (40507d4) +++ lib/alpha/double_array.hpp 2013-03-08 16:55:52 +0900 (7bc6838) @@ -18,7 +18,7 @@ #ifndef GRNXX_ALPHA_DOUBLE_ARRAY_HPP #define GRNXX_ALPHA_DOUBLE_ARRAY_HPP -#include "../db/vector.hpp" +#include "db/vector.hpp" namespace grnxx { namespace alpha { Modified: lib/db/blob_vector.cpp (+4 -4) =================================================================== --- lib/db/blob_vector.cpp 2013-03-08 16:21:07 +0900 (a5922b4) +++ lib/db/blob_vector.cpp 2013-03-08 16:55:52 +0900 (8e7c5ee) @@ -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 "blob_vector.hpp" +#include "db/blob_vector.hpp" -#include "../exception.hpp" -#include "../lock.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "lock.hpp" +#include "logger.hpp" namespace grnxx { namespace db { Modified: lib/db/blob_vector.hpp (+1 -1) =================================================================== --- lib/db/blob_vector.hpp 2013-03-08 16:21:07 +0900 (cb4db2f) +++ lib/db/blob_vector.hpp 2013-03-08 16:55:52 +0900 (7dc2d14) @@ -18,7 +18,7 @@ #ifndef GRNXX_DB_BLOB_VECTOR_HPP #define GRNXX_DB_BLOB_VECTOR_HPP -#include "vector.hpp" +#include "db/vector.hpp" namespace grnxx { namespace db { Modified: lib/db/vector.cpp (+4 -4) =================================================================== --- lib/db/vector.cpp 2013-03-08 16:21:07 +0900 (4d2481a) +++ lib/db/vector.cpp 2013-03-08 16:55:52 +0900 (03f8c5d) @@ -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 "vector.hpp" +#include "db/vector.hpp" #include <vector> -#include "../exception.hpp" -#include "../lock.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "lock.hpp" +#include "logger.hpp" namespace grnxx { namespace db { Modified: lib/db/vector.hpp (+1 -1) =================================================================== --- lib/db/vector.hpp 2013-03-08 16:21:07 +0900 (027acd1) +++ lib/db/vector.hpp 2013-03-08 16:55:52 +0900 (2a62ed9) @@ -18,7 +18,7 @@ #ifndef GRNXX_DB_VECTOR_HPP #define GRNXX_DB_VECTOR_HPP -#include "../io/pool.hpp" +#include "io/pool.hpp" namespace grnxx { namespace db { Modified: lib/io/block.cpp (+1 -1) =================================================================== --- lib/io/block.cpp 2013-03-08 16:21:07 +0900 (6ab9d4d) +++ lib/io/block.cpp 2013-03-08 16:55:52 +0900 (f537a96) @@ -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 "block.hpp" +#include "io/block.hpp" #include <ostream> Modified: lib/io/block.hpp (+1 -1) =================================================================== --- lib/io/block.hpp 2013-03-08 16:21:07 +0900 (92a22ee) +++ lib/io/block.hpp 2013-03-08 16:55:52 +0900 (085d66a) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_BLOCK_HPP #define GRNXX_IO_BLOCK_HPP -#include "../string_builder.hpp" +#include "string_builder.hpp" namespace grnxx { namespace io { Modified: lib/io/chunk.cpp (+1 -1) =================================================================== --- lib/io/chunk.cpp 2013-03-08 16:21:07 +0900 (7ed0a51) +++ lib/io/chunk.cpp 2013-03-08 16:55:52 +0900 (68384c0) @@ -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 "chunk.hpp" +#include "io/chunk.hpp" namespace grnxx { namespace io { Modified: lib/io/chunk.hpp (+2 -2) =================================================================== --- lib/io/chunk.hpp 2013-03-08 16:21:07 +0900 (8777677) +++ lib/io/chunk.hpp 2013-03-08 16:55:52 +0900 (11be26d) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_CHUNK_HPP #define GRNXX_IO_CHUNK_HPP -#include "block.hpp" -#include "view.hpp" +#include "io/block.hpp" +#include "io/view.hpp" namespace grnxx { namespace io { Modified: lib/io/file-posix.cpp (+7 -7) =================================================================== --- lib/io/file-posix.cpp 2013-03-08 16:21:07 +0900 (4310004) +++ lib/io/file-posix.cpp 2013-03-08 16:55:52 +0900 (a7eade1) @@ -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 "file-posix.hpp" +#include "io/file-posix.hpp" #ifndef GRNXX_WINDOWS @@ -27,12 +27,12 @@ #include <algorithm> -#include "../error.hpp" -#include "../exception.hpp" -#include "../logger.hpp" -#include "../stopwatch.hpp" -#include "../thread.hpp" -#include "path.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "io/path.hpp" +#include "logger.hpp" +#include "stopwatch.hpp" +#include "thread.hpp" namespace grnxx { namespace io { Modified: lib/io/file-posix.hpp (+1 -1) =================================================================== --- lib/io/file-posix.hpp 2013-03-08 16:21:07 +0900 (50171ee) +++ lib/io/file-posix.hpp 2013-03-08 16:55:52 +0900 (a90cd6f) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_POSIX_HPP #define GRNXX_IO_FILE_POSIX_HPP -#include "file.hpp" +#include "io/file.hpp" #ifndef GRNXX_WINDOWS Modified: lib/io/file-windows.cpp (+7 -7) =================================================================== --- lib/io/file-windows.cpp 2013-03-08 16:21:07 +0900 (2bcb4ea) +++ lib/io/file-windows.cpp 2013-03-08 16:55:52 +0900 (f4230fb) @@ -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 "file-windows.hpp" +#include "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 "../logger.hpp" -#include "../stopwatch.hpp" -#include "../thread.hpp" -#include "path.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "io/path.hpp" +#include "logger.hpp" +#include "stopwatch.hpp" +#include "thread.hpp" namespace grnxx { namespace io { Modified: lib/io/file-windows.hpp (+1 -1) =================================================================== --- lib/io/file-windows.hpp 2013-03-08 16:21:07 +0900 (5ea0b03) +++ lib/io/file-windows.hpp 2013-03-08 16:55:52 +0900 (27228b4) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_WINDOWS_HPP #define GRNXX_IO_FILE_WINDOWS_HPP -#include "file.hpp" +#include "io/file.hpp" #ifdef GRNXX_WINDOWS Modified: lib/io/file.cpp (+5 -5) =================================================================== --- lib/io/file.cpp 2013-03-08 16:21:07 +0900 (acc6b61) +++ lib/io/file.cpp 2013-03-08 16:55:52 +0900 (5cded4b) @@ -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 "file.hpp" -#include "file-posix.hpp" -#include "file-windows.hpp" +#include "io/file.hpp" #include <ostream> -#include "../exception.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "io/file-posix.hpp" +#include "io/file-windows.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/io/file.hpp (+1 -1) =================================================================== --- lib/io/file.hpp 2013-03-08 16:21:07 +0900 (9ead8a8) +++ lib/io/file.hpp 2013-03-08 16:55:52 +0900 (ee6e24a) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_HPP #define GRNXX_IO_FILE_HPP -#include "../duration.hpp" +#include "duration.hpp" namespace grnxx { namespace io { Modified: lib/io/file_info.cpp (+5 -5) =================================================================== --- lib/io/file_info.cpp 2013-03-08 16:21:07 +0900 (1e78abd) +++ lib/io/file_info.cpp 2013-03-08 16:55:52 +0900 (81a7673) @@ -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 "file_info.hpp" +#include "io/file_info.hpp" #include <sys/types.h> #include <sys/stat.h> #include <cerrno> -#include "../error.hpp" -#include "../exception.hpp" -#include "../logger.hpp" -#include "file.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "io/file.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/io/file_info.hpp (+1 -1) =================================================================== --- lib/io/file_info.hpp 2013-03-08 16:21:07 +0900 (ee2908f) +++ lib/io/file_info.hpp 2013-03-08 16:55:52 +0900 (15e4aab) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_FILE_INFO_HPP #define GRNXX_IO_FILE_INFO_HPP -#include "../time.hpp" +#include "time.hpp" namespace grnxx { namespace io { Modified: lib/io/path.cpp (+4 -4) =================================================================== --- lib/io/path.cpp 2013-03-08 16:21:07 +0900 (1a76c0d) +++ lib/io/path.cpp 2013-03-08 16:55:52 +0900 (933a5cc) @@ -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 "path.hpp" +#include "io/path.hpp" #include <cerrno> #include <cstdlib> #include <random> -#include "../error.hpp" -#include "../exception.hpp" -#include "../logger.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/io/path.hpp (+1 -1) =================================================================== --- lib/io/path.hpp 2013-03-08 16:21:07 +0900 (ee99aa4) +++ lib/io/path.hpp 2013-03-08 16:55:52 +0900 (17295b2) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_PATH_HPP #define GRNXX_IO_PATH_HPP -#include "../string.hpp" +#include "string.hpp" namespace grnxx { namespace io { Modified: lib/io/pool-impl.cpp (+8 -8) =================================================================== --- lib/io/pool-impl.cpp 2013-03-08 16:21:07 +0900 (6707b8f) +++ lib/io/pool-impl.cpp 2013-03-08 16:55:52 +0900 (4769f41) @@ -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 "pool-impl.hpp" +#include "io/pool-impl.hpp" #include <vector> -#include "../exception.hpp" -#include "../lock.hpp" -#include "../logger.hpp" -#include "../stopwatch.hpp" -#include "../string_format.hpp" -#include "../thread.hpp" -#include "path.hpp" +#include "exception.hpp" +#include "io/path.hpp" +#include "lock.hpp" +#include "logger.hpp" +#include "stopwatch.hpp" +#include "string_format.hpp" +#include "thread.hpp" namespace grnxx { namespace io { Modified: lib/io/pool-impl.hpp (+2 -2) =================================================================== --- lib/io/pool-impl.hpp 2013-03-08 16:21:07 +0900 (3aef73f) +++ lib/io/pool-impl.hpp 2013-03-08 16:55:52 +0900 (445e76d) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_POOL_IMPL_HPP #define GRNXX_IO_POOL_IMPL_HPP -#include "file.hpp" -#include "pool.hpp" +#include "io/file.hpp" +#include "io/pool.hpp" namespace grnxx { namespace io { Modified: lib/io/pool.cpp (+3 -3) =================================================================== --- lib/io/pool.cpp 2013-03-08 16:21:07 +0900 (2dcc4cc) +++ lib/io/pool.cpp 2013-03-08 16:55:52 +0900 (dcfb1d0) @@ -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 "pool-impl.hpp" +#include "io/pool-impl.hpp" #include <ostream> -#include "../exception.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/io/pool.hpp (+3 -3) =================================================================== --- lib/io/pool.hpp 2013-03-08 16:21:07 +0900 (53f7833) +++ lib/io/pool.hpp 2013-03-08 16:55:52 +0900 (63aeea9) @@ -18,9 +18,9 @@ #ifndef GRNXX_IO_POOL_HPP #define GRNXX_IO_POOL_HPP -#include "../mutex.hpp" -#include "../recycler.hpp" -#include "chunk.hpp" +#include "io/chunk.hpp" +#include "mutex.hpp" +#include "recycler.hpp" namespace grnxx { namespace io { Modified: lib/io/view-posix.cpp (+5 -5) =================================================================== --- lib/io/view-posix.cpp 2013-03-08 16:21:07 +0900 (05f7c56) +++ lib/io/view-posix.cpp 2013-03-08 16:55:52 +0900 (35879a3) @@ -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 "view-posix.hpp" +#include "io/view-posix.hpp" #ifndef GRNXX_WINDOWS #include <sys/mman.h> #include <errno.h> -#include "../error.hpp" -#include "../exception.hpp" -#include "../logger.hpp" -#include "file.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "logger.hpp" +#include "io/file.hpp" #ifndef MAP_ANONYMOUS # ifdef MAP_ANON Modified: lib/io/view-posix.hpp (+1 -1) =================================================================== --- lib/io/view-posix.hpp 2013-03-08 16:21:07 +0900 (1f2bc87) +++ lib/io/view-posix.hpp 2013-03-08 16:55:52 +0900 (5e6aa1c) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_VIEW_POSIX_HPP #define GRNXX_IO_VIEW_POSIX_HPP -#include "view.hpp" +#include "io/view.hpp" #ifndef GRNXX_WINDOWS Modified: lib/io/view-windows.cpp (+5 -5) =================================================================== --- lib/io/view-windows.cpp 2013-03-08 16:21:07 +0900 (828d5f2) +++ lib/io/view-windows.cpp 2013-03-08 16:55:52 +0900 (894e497) @@ -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 "view-windows.hpp" +#include "io/view-windows.hpp" #ifdef GRNXX_WINDOWS -#include "../error.hpp" -#include "../exception.hpp" -#include "../logger.hpp" -#include "file.hpp" +#include "error.hpp" +#include "exception.hpp" +#include "logger.hpp" +#include "io/file.hpp" namespace grnxx { namespace io { Modified: lib/io/view-windows.hpp (+1 -1) =================================================================== --- lib/io/view-windows.hpp 2013-03-08 16:21:07 +0900 (e530f4b) +++ lib/io/view-windows.hpp 2013-03-08 16:55:52 +0900 (e93fa1e) @@ -18,7 +18,7 @@ #ifndef GRNXX_IO_VIEW_WINDOWS_HPP #define GRNXX_IO_VIEW_WINDOWS_HPP -#include "view.hpp" +#include "io/view.hpp" #ifdef GRNXX_WINDOWS Modified: lib/io/view.cpp (+5 -5) =================================================================== --- lib/io/view.cpp 2013-03-08 16:21:07 +0900 (91f47b1) +++ lib/io/view.cpp 2013-03-08 16:55:52 +0900 (b3ced46) @@ -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 "view.hpp" -#include "view-posix.hpp" -#include "view-windows.hpp" +#include "io/view.hpp" #include <ostream> -#include "../exception.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "io/view-posix.hpp" +#include "io/view-windows.hpp" +#include "logger.hpp" namespace grnxx { namespace io { Modified: lib/io/view.hpp (+2 -2) =================================================================== --- lib/io/view.hpp 2013-03-08 16:21:07 +0900 (c21cea4) +++ lib/io/view.hpp 2013-03-08 16:55:52 +0900 (745cdb4) @@ -18,8 +18,8 @@ #ifndef GRNXX_IO_VIEW_HPP #define GRNXX_IO_VIEW_HPP -#include "../basic.hpp" -#include "../string_builder.hpp" +#include "basic.hpp" +#include "string_builder.hpp" namespace grnxx { namespace io { Modified: lib/map/da/basic_trie.cpp (+4 -4) =================================================================== --- lib/map/da/basic_trie.cpp 2013-03-08 16:21:07 +0900 (9bbab58) +++ lib/map/da/basic_trie.cpp 2013-03-08 16:55:52 +0900 (15f0b63) @@ -1,8 +1,8 @@ -#include "basic_trie.hpp" -#include "large_trie.hpp" +#include "map/da/basic_trie.hpp" -#include "../../lock.hpp" -#include "../../logger.hpp" +#include "lock.hpp" +#include "logger.hpp" +#include "map/da/large_trie.hpp" namespace grnxx { namespace map { Modified: lib/map/da/basic_trie.hpp (+1 -1) =================================================================== --- lib/map/da/basic_trie.hpp 2013-03-08 16:21:07 +0900 (32554b6) +++ lib/map/da/basic_trie.hpp 2013-03-08 16:55:52 +0900 (80e0a1a) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_BASIC_TRIE_HPP #define GRNXX_MAP_DA_BASIC_TRIE_HPP -#include "trie.hpp" +#include "map/da/trie.hpp" #if 0 # define GRNXX_DEBUG_THROW(msg)\ Modified: lib/map/da/large_trie.cpp (+3 -3) =================================================================== --- lib/map/da/large_trie.cpp 2013-03-08 16:21:07 +0900 (2d6a1b5) +++ lib/map/da/large_trie.cpp 2013-03-08 16:55:52 +0900 (a9a073d) @@ -1,7 +1,7 @@ -#include "large_trie.hpp" +#include "map/da/large_trie.hpp" -#include "../../lock.hpp" -#include "../../logger.hpp" +#include "lock.hpp" +#include "logger.hpp" namespace grnxx { namespace map { Modified: lib/map/da/large_trie.hpp (+1 -1) =================================================================== --- lib/map/da/large_trie.hpp 2013-03-08 16:21:07 +0900 (95b4483) +++ lib/map/da/large_trie.hpp 2013-03-08 16:55:52 +0900 (e89d1b3) @@ -18,7 +18,7 @@ #ifndef GRNXX_MAP_DA_LARGE_TRIE_HPP #define GRNXX_MAP_DA_LARGE_TRIE_HPP -#include "basic_trie.hpp" +#include "map/da/basic_trie.hpp" namespace grnxx { namespace map { Modified: lib/map/da/trie.cpp (+4 -4) =================================================================== --- lib/map/da/trie.cpp 2013-03-08 16:21:07 +0900 (ad78e9f) +++ lib/map/da/trie.cpp 2013-03-08 16:55:52 +0900 (09e84e5) @@ -1,8 +1,8 @@ -#include "trie.hpp" -#include "basic_trie.hpp" -#include "large_trie.hpp" +#include "map/da/trie.hpp" -#include "../../logger.hpp" +#include "logger.hpp" +#include "map/da/basic_trie.hpp" +#include "map/da/large_trie.hpp" namespace grnxx { namespace map { Modified: lib/map/da/trie.hpp (+2 -2) =================================================================== --- lib/map/da/trie.hpp 2013-03-08 16:21:07 +0900 (d9326dd) +++ lib/map/da/trie.hpp 2013-03-08 16:55:52 +0900 (95e7bed) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DA_TRIE_HPP #define GRNXX_MAP_DA_TRIE_HPP -#include "../../exception.hpp" -#include "../../map.hpp" +#include "exception.hpp" +#include "map.hpp" namespace grnxx { namespace map { Modified: lib/map/double_array.cpp (+4 -4) =================================================================== --- lib/map/double_array.cpp 2013-03-08 16:21:07 +0900 (f514a80) +++ lib/map/double_array.cpp 2013-03-08 16:55:52 +0900 (104aeee) @@ -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 "double_array.hpp" +#include "map/double_array.hpp" -#include "../exception.hpp" -#include "../lock.hpp" -#include "../logger.hpp" +#include "exception.hpp" +#include "lock.hpp" +#include "logger.hpp" namespace grnxx { namespace map { Modified: lib/map/double_array.hpp (+2 -2) =================================================================== --- lib/map/double_array.hpp 2013-03-08 16:21:07 +0900 (8d6b60e) +++ lib/map/double_array.hpp 2013-03-08 16:55:52 +0900 (035e366) @@ -18,8 +18,8 @@ #ifndef GRNXX_MAP_DOUBLE_ARRAY_HPP #define GRNXX_MAP_DOUBLE_ARRAY_HPP -#include "../map.hpp" -#include "da/trie.hpp" +#include "map.hpp" +#include "map/da/trie.hpp" namespace grnxx { namespace map { Modified: test/Makefile.am (+1 -1) =================================================================== --- test/Makefile.am 2013-03-08 16:21:07 +0900 (cba1cbf) +++ test/Makefile.am 2013-03-08 16:55:52 +0900 (3009c43) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = @AM_CXXFLAGS@ -I$(top_srcdir)/lib +AM_CXXFLAGS = @AM_CXXFLAGS@ TESTS = \ test_alpha_double_array \ -------------- next part -------------- HTML����������������������������...Download