From 4671a695fca3a8fb00cdf4609cd8238cf12ed13d Mon Sep 17 00:00:00 2001 From: "jorlow@chromium.org" Date: Wed, 30 Mar 2011 18:35:40 +0000 Subject: [PATCH] Move include files into a leveldb subdir. git-svn-id: https://leveldb.googlecode.com/svn/trunk@18 62dab493-f737-651d-591e-8d6aee1b9529 --- Makefile | 2 +- db/builder.cc | 6 +++--- db/builder.h | 2 +- db/corruption_test.cc | 8 ++++---- db/db_bench.cc | 8 ++++---- db/db_impl.cc | 10 +++++----- db/db_impl.h | 4 ++-- db/db_iter.cc | 4 ++-- db/db_iter.h | 2 +- db/db_test.cc | 6 +++--- db/dbformat.h | 8 ++++---- db/filename.cc | 2 +- db/filename.h | 4 ++-- db/log_reader.cc | 2 +- db/log_reader.h | 4 ++-- db/log_test.cc | 2 +- db/log_writer.cc | 2 +- db/log_writer.h | 4 ++-- db/memtable.cc | 6 +++--- db/memtable.h | 2 +- db/repair.cc | 6 +++--- db/skiplist_test.cc | 2 +- db/snapshot.h | 2 +- db/table_cache.cc | 4 ++-- db/table_cache.h | 4 ++-- db/version_set.cc | 4 ++-- db/write_batch.cc | 4 ++-- db/write_batch_internal.h | 2 +- db/write_batch_test.cc | 4 ++-- leveldb.gyp | 28 +++++++++++++++++----------- table/block.cc | 2 +- table/block.h | 2 +- table/block_builder.cc | 4 ++-- table/block_builder.h | 2 +- table/format.cc | 2 +- table/format.h | 6 +++--- table/iterator.cc | 2 +- table/merger.cc | 4 ++-- table/table.cc | 6 +++--- table/table_builder.cc | 6 +++--- table/table_test.cc | 10 +++++----- table/two_level_iterator.cc | 2 +- table/two_level_iterator.h | 2 +- util/cache.cc | 2 +- util/cache_test.cc | 2 +- util/coding.h | 2 +- util/comparator.cc | 4 ++-- util/env.cc | 2 +- util/env_chromium.cc | 4 ++-- util/env_posix.cc | 4 ++-- util/env_test.cc | 2 +- util/logging.cc | 4 ++-- util/options.cc | 6 +++--- util/status.cc | 2 +- util/testharness.h | 4 ++-- util/testutil.h | 4 ++-- 56 files changed, 123 insertions(+), 117 deletions(-) diff --git a/Makefile b/Makefile index 8fbcddf1b..756970150 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CC = g++ #OPT = -O2 -DNDEBUG OPT = -g2 -CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -std=c++0x $(OPT) +CFLAGS = -c -DLEVELDB_PLATFORM_POSIX -I. -I./include -std=c++0x $(OPT) LDFLAGS=-lpthread diff --git a/db/builder.cc b/db/builder.cc index d5585c3fe..6c8e6b8ef 100644 --- a/db/builder.cc +++ b/db/builder.cc @@ -8,9 +8,9 @@ #include "db/dbformat.h" #include "db/table_cache.h" #include "db/version_edit.h" -#include "include/db.h" -#include "include/env.h" -#include "include/iterator.h" +#include "leveldb/db.h" +#include "leveldb/env.h" +#include "leveldb/iterator.h" namespace leveldb { diff --git a/db/builder.h b/db/builder.h index 2d8afdf37..4efcb04a5 100644 --- a/db/builder.h +++ b/db/builder.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_DB_BUILDER_H_ #define STORAGE_LEVELDB_DB_BUILDER_H_ -#include "include/status.h" +#include "leveldb/status.h" namespace leveldb { diff --git a/db/corruption_test.cc b/db/corruption_test.cc index 1f4f26c7e..de9408c3a 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/db.h" +#include "leveldb/db.h" #include #include #include #include -#include "include/env.h" -#include "include/table.h" -#include "include/write_batch.h" +#include "leveldb/env.h" +#include "leveldb/table.h" +#include "leveldb/write_batch.h" #include "db/db_impl.h" #include "db/filename.h" #include "db/log_format.h" diff --git a/db/db_bench.cc b/db/db_bench.cc index c7a662d6d..411493cc9 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -7,10 +7,10 @@ #include #include "db/db_impl.h" #include "db/version_set.h" -#include "include/cache.h" -#include "include/db.h" -#include "include/env.h" -#include "include/write_batch.h" +#include "leveldb/cache.h" +#include "leveldb/db.h" +#include "leveldb/env.h" +#include "leveldb/write_batch.h" #include "port/port.h" #include "util/crc32c.h" #include "util/histogram.h" diff --git a/db/db_impl.cc b/db/db_impl.cc index f14167a00..cf5471b28 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -20,11 +20,11 @@ #include "db/table_cache.h" #include "db/version_set.h" #include "db/write_batch_internal.h" -#include "include/db.h" -#include "include/env.h" -#include "include/status.h" -#include "include/table.h" -#include "include/table_builder.h" +#include "leveldb/db.h" +#include "leveldb/env.h" +#include "leveldb/status.h" +#include "leveldb/table.h" +#include "leveldb/table_builder.h" #include "port/port.h" #include "table/block.h" #include "table/merger.h" diff --git a/db/db_impl.h b/db/db_impl.h index 6e98e3c2e..49ac37b9d 100644 --- a/db/db_impl.h +++ b/db/db_impl.h @@ -9,8 +9,8 @@ #include "db/dbformat.h" #include "db/log_writer.h" #include "db/snapshot.h" -#include "include/db.h" -#include "include/env.h" +#include "leveldb/db.h" +#include "leveldb/env.h" #include "port/port.h" namespace leveldb { diff --git a/db/db_iter.cc b/db/db_iter.cc index beb4d7493..31c2a38f5 100644 --- a/db/db_iter.cc +++ b/db/db_iter.cc @@ -6,8 +6,8 @@ #include "db/filename.h" #include "db/dbformat.h" -#include "include/env.h" -#include "include/iterator.h" +#include "leveldb/env.h" +#include "leveldb/iterator.h" #include "port/port.h" #include "util/logging.h" #include "util/mutexlock.h" diff --git a/db/db_iter.h b/db/db_iter.h index a0be50e2b..195f3d3d6 100644 --- a/db/db_iter.h +++ b/db/db_iter.h @@ -6,7 +6,7 @@ #define STORAGE_LEVELDB_DB_DB_ITER_H_ #include -#include "include/db.h" +#include "leveldb/db.h" #include "db/dbformat.h" namespace leveldb { diff --git a/db/db_test.cc b/db/db_test.cc index 041417630..f68e7594f 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/db.h" +#include "leveldb/db.h" #include "db/db_impl.h" #include "db/filename.h" #include "db/version_set.h" #include "db/write_batch_internal.h" -#include "include/env.h" -#include "include/table.h" +#include "leveldb/env.h" +#include "leveldb/table.h" #include "util/logging.h" #include "util/testharness.h" #include "util/testutil.h" diff --git a/db/dbformat.h b/db/dbformat.h index e78445743..6f34cd16e 100644 --- a/db/dbformat.h +++ b/db/dbformat.h @@ -6,10 +6,10 @@ #define STORAGE_LEVELDB_DB_FORMAT_H_ #include -#include "include/comparator.h" -#include "include/db.h" -#include "include/slice.h" -#include "include/table_builder.h" +#include "leveldb/comparator.h" +#include "leveldb/db.h" +#include "leveldb/slice.h" +#include "leveldb/table_builder.h" #include "util/coding.h" #include "util/logging.h" diff --git a/db/filename.cc b/db/filename.cc index 55e6d285e..d21918c87 100644 --- a/db/filename.cc +++ b/db/filename.cc @@ -6,7 +6,7 @@ #include #include "db/filename.h" #include "db/dbformat.h" -#include "include/env.h" +#include "leveldb/env.h" #include "util/logging.h" namespace leveldb { diff --git a/db/filename.h b/db/filename.h index 3fd2ea49b..81ab2fc1e 100644 --- a/db/filename.h +++ b/db/filename.h @@ -9,8 +9,8 @@ #include #include -#include "include/slice.h" -#include "include/status.h" +#include "leveldb/slice.h" +#include "leveldb/status.h" #include "port/port.h" namespace leveldb { diff --git a/db/log_reader.cc b/db/log_reader.cc index 407700d13..75e1d2850 100644 --- a/db/log_reader.cc +++ b/db/log_reader.cc @@ -5,7 +5,7 @@ #include "db/log_reader.h" #include -#include "include/env.h" +#include "leveldb/env.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/db/log_reader.h b/db/log_reader.h index 515d2af4e..baf147560 100644 --- a/db/log_reader.h +++ b/db/log_reader.h @@ -6,8 +6,8 @@ #define STORAGE_LEVELDB_DB_LOG_READER_H_ #include "db/log_format.h" -#include "include/slice.h" -#include "include/status.h" +#include "leveldb/slice.h" +#include "leveldb/status.h" namespace leveldb { diff --git a/db/log_test.cc b/db/log_test.cc index 5fa20aa76..025a5ff84 100644 --- a/db/log_test.cc +++ b/db/log_test.cc @@ -4,7 +4,7 @@ #include "db/log_reader.h" #include "db/log_writer.h" -#include "include/env.h" +#include "leveldb/env.h" #include "util/coding.h" #include "util/crc32c.h" #include "util/random.h" diff --git a/db/log_writer.cc b/db/log_writer.cc index fc33e6eb0..18ca37a7f 100644 --- a/db/log_writer.cc +++ b/db/log_writer.cc @@ -5,7 +5,7 @@ #include "db/log_writer.h" #include -#include "include/env.h" +#include "leveldb/env.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/db/log_writer.h b/db/log_writer.h index 13c64bad2..d3cf27d35 100644 --- a/db/log_writer.h +++ b/db/log_writer.h @@ -7,8 +7,8 @@ #include #include "db/log_format.h" -#include "include/slice.h" -#include "include/status.h" +#include "leveldb/slice.h" +#include "leveldb/status.h" namespace leveldb { diff --git a/db/memtable.cc b/db/memtable.cc index 349cfcc18..a3b618a8a 100644 --- a/db/memtable.cc +++ b/db/memtable.cc @@ -4,9 +4,9 @@ #include "db/memtable.h" #include "db/dbformat.h" -#include "include/comparator.h" -#include "include/env.h" -#include "include/iterator.h" +#include "leveldb/comparator.h" +#include "leveldb/env.h" +#include "leveldb/iterator.h" #include "util/coding.h" namespace leveldb { diff --git a/db/memtable.h b/db/memtable.h index fa95e1530..45b3342ae 100644 --- a/db/memtable.h +++ b/db/memtable.h @@ -6,7 +6,7 @@ #define STORAGE_LEVELDB_DB_MEMTABLE_H_ #include -#include "include/db.h" +#include "leveldb/db.h" #include "db/dbformat.h" #include "db/skiplist.h" #include "util/arena.h" diff --git a/db/repair.cc b/db/repair.cc index 745b31a17..014e00e7e 100644 --- a/db/repair.cc +++ b/db/repair.cc @@ -36,9 +36,9 @@ #include "db/table_cache.h" #include "db/version_edit.h" #include "db/write_batch_internal.h" -#include "include/comparator.h" -#include "include/db.h" -#include "include/env.h" +#include "leveldb/comparator.h" +#include "leveldb/db.h" +#include "leveldb/env.h" namespace leveldb { diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc index 0cfc89343..5f9ec0d09 100644 --- a/db/skiplist_test.cc +++ b/db/skiplist_test.cc @@ -4,7 +4,7 @@ #include "db/skiplist.h" #include -#include "include/env.h" +#include "leveldb/env.h" #include "util/arena.h" #include "util/hash.h" #include "util/random.h" diff --git a/db/snapshot.h b/db/snapshot.h index 6a07f8057..9a9075672 100644 --- a/db/snapshot.h +++ b/db/snapshot.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_DB_SNAPSHOT_H_ #define STORAGE_LEVELDB_DB_SNAPSHOT_H_ -#include "include/db.h" +#include "leveldb/db.h" namespace leveldb { diff --git a/db/table_cache.cc b/db/table_cache.cc index 6f750d6db..325d707ad 100644 --- a/db/table_cache.cc +++ b/db/table_cache.cc @@ -5,8 +5,8 @@ #include "db/table_cache.h" #include "db/filename.h" -#include "include/env.h" -#include "include/table.h" +#include "leveldb/env.h" +#include "leveldb/table.h" #include "util/coding.h" namespace leveldb { diff --git a/db/table_cache.h b/db/table_cache.h index 5564dfc11..53761944d 100644 --- a/db/table_cache.h +++ b/db/table_cache.h @@ -10,8 +10,8 @@ #include #include #include "db/dbformat.h" -#include "include/cache.h" -#include "include/table.h" +#include "leveldb/cache.h" +#include "leveldb/table.h" #include "port/port.h" namespace leveldb { diff --git a/db/version_set.cc b/db/version_set.cc index b826e5bbf..dc9b4182e 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -11,8 +11,8 @@ #include "db/log_writer.h" #include "db/memtable.h" #include "db/table_cache.h" -#include "include/env.h" -#include "include/table_builder.h" +#include "leveldb/env.h" +#include "leveldb/table_builder.h" #include "table/merger.h" #include "table/two_level_iterator.h" #include "util/coding.h" diff --git a/db/write_batch.cc b/db/write_batch.cc index b6c4979d9..e84e54889 100644 --- a/db/write_batch.cc +++ b/db/write_batch.cc @@ -14,9 +14,9 @@ // len: varint32 // data: uint8[len] -#include "include/write_batch.h" +#include "leveldb/write_batch.h" -#include "include/db.h" +#include "leveldb/db.h" #include "db/dbformat.h" #include "db/memtable.h" #include "db/write_batch_internal.h" diff --git a/db/write_batch_internal.h b/db/write_batch_internal.h index df750c716..ea28e2d6a 100644 --- a/db/write_batch_internal.h +++ b/db/write_batch_internal.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_ #define STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_ -#include "include/write_batch.h" +#include "leveldb/write_batch.h" namespace leveldb { diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc index 4963579bd..deb841108 100644 --- a/db/write_batch_test.cc +++ b/db/write_batch_test.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/db.h" +#include "leveldb/db.h" #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "include/env.h" +#include "leveldb/env.h" #include "util/logging.h" #include "util/testharness.h" diff --git a/leveldb.gyp b/leveldb.gyp index eb809f3b1..d10ac339f 100644 --- a/leveldb.gyp +++ b/leveldb.gyp @@ -12,6 +12,7 @@ ], 'include_dirs': [ '.', + 'include/', ], 'conditions': [ ['OS == "win"', { @@ -42,6 +43,11 @@ ], }], ], + 'direct_dependent_settings': { + 'include_dirs': [ + 'include/', + ], + }, 'sources': [ # Include and then exclude so that all files show up in IDEs, even if # they don't build. @@ -73,17 +79,17 @@ 'db/version_set.h', 'db/write_batch.cc', 'db/write_batch_internal.h', - 'include/cache.h', - 'include/comparator.h', - 'include/db.h', - 'include/env.h', - 'include/iterator.h', - 'include/options.h', - 'include/slice.h', - 'include/status.h', - 'include/table.h', - 'include/table_builder.h', - 'include/write_batch.h', + 'include/leveldb/cache.h', + 'include/leveldb/comparator.h', + 'include/leveldb/db.h', + 'include/leveldb/env.h', + 'include/leveldb/iterator.h', + 'include/leveldb/options.h', + 'include/leveldb/slice.h', + 'include/leveldb/status.h', + 'include/leveldb/table.h', + 'include/leveldb/table_builder.h', + 'include/leveldb/write_batch.h', 'port/port.h', 'port/port_chromium.cc', 'port/port_chromium.h', diff --git a/table/block.cc b/table/block.cc index 351eb481a..0525d2d15 100644 --- a/table/block.cc +++ b/table/block.cc @@ -8,7 +8,7 @@ #include #include -#include "include/comparator.h" +#include "leveldb/comparator.h" #include "util/coding.h" #include "util/logging.h" diff --git a/table/block.h b/table/block.h index 937200193..cdf059842 100644 --- a/table/block.h +++ b/table/block.h @@ -7,7 +7,7 @@ #include #include -#include "include/iterator.h" +#include "leveldb/iterator.h" namespace leveldb { diff --git a/table/block_builder.cc b/table/block_builder.cc index 2c3349246..ae18b36c1 100644 --- a/table/block_builder.cc +++ b/table/block_builder.cc @@ -30,8 +30,8 @@ #include #include -#include "include/comparator.h" -#include "include/table_builder.h" +#include "leveldb/comparator.h" +#include "leveldb/table_builder.h" #include "util/coding.h" namespace leveldb { diff --git a/table/block_builder.h b/table/block_builder.h index beab168fb..bf92a0f19 100644 --- a/table/block_builder.h +++ b/table/block_builder.h @@ -8,7 +8,7 @@ #include #include -#include "include/slice.h" +#include "leveldb/slice.h" namespace leveldb { diff --git a/table/format.cc b/table/format.cc index 191a9bd24..8c6b0f373 100644 --- a/table/format.cc +++ b/table/format.cc @@ -4,7 +4,7 @@ #include "table/format.h" -#include "include/env.h" +#include "leveldb/env.h" #include "port/port.h" #include "table/block.h" #include "util/coding.h" diff --git a/table/format.h b/table/format.h index 03e3ee2fb..a6ab964f5 100644 --- a/table/format.h +++ b/table/format.h @@ -7,9 +7,9 @@ #include #include -#include "include/slice.h" -#include "include/status.h" -#include "include/table_builder.h" +#include "leveldb/slice.h" +#include "leveldb/status.h" +#include "leveldb/table_builder.h" namespace leveldb { diff --git a/table/iterator.cc b/table/iterator.cc index f3c0856af..4ddd55f5d 100644 --- a/table/iterator.cc +++ b/table/iterator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/iterator.h" +#include "leveldb/iterator.h" #include "util/logging.h" namespace leveldb { diff --git a/table/merger.cc b/table/merger.cc index afa8b779c..6ce06bb58 100644 --- a/table/merger.cc +++ b/table/merger.cc @@ -4,8 +4,8 @@ #include "table/merger.h" -#include "include/comparator.h" -#include "include/iterator.h" +#include "leveldb/comparator.h" +#include "leveldb/iterator.h" #include "table/iterator_wrapper.h" namespace leveldb { diff --git a/table/table.cc b/table/table.cc index bd0fbb5ee..9820753b7 100644 --- a/table/table.cc +++ b/table/table.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/table.h" +#include "leveldb/table.h" -#include "include/cache.h" -#include "include/env.h" +#include "leveldb/cache.h" +#include "leveldb/env.h" #include "table/block.h" #include "table/format.h" #include "table/two_level_iterator.h" diff --git a/table/table_builder.cc b/table/table_builder.cc index 3bc1b88c2..7ec7ad261 100644 --- a/table/table_builder.cc +++ b/table/table_builder.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/table_builder.h" +#include "leveldb/table_builder.h" #include #include -#include "include/comparator.h" -#include "include/env.h" +#include "leveldb/comparator.h" +#include "leveldb/env.h" #include "table/block_builder.h" #include "table/format.h" #include "util/coding.h" diff --git a/table/table_test.cc b/table/table_test.cc index d67c58bd3..e0c71343e 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/table.h" +#include "leveldb/table.h" #include #include "db/dbformat.h" #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "include/db.h" -#include "include/env.h" -#include "include/iterator.h" -#include "include/table_builder.h" +#include "leveldb/db.h" +#include "leveldb/env.h" +#include "leveldb/iterator.h" +#include "leveldb/table_builder.h" #include "table/block.h" #include "table/block_builder.h" #include "table/format.h" diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc index 9b081f4a1..24a12412d 100644 --- a/table/two_level_iterator.cc +++ b/table/two_level_iterator.cc @@ -4,7 +4,7 @@ #include "table/two_level_iterator.h" -#include "include/table.h" +#include "leveldb/table.h" #include "table/block.h" #include "table/format.h" #include "table/iterator_wrapper.h" diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h index 57e439ccb..5909e2b93 100644 --- a/table/two_level_iterator.h +++ b/table/two_level_iterator.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_ #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_ -#include "include/iterator.h" +#include "leveldb/iterator.h" namespace leveldb { diff --git a/util/cache.cc b/util/cache.cc index 958de66e8..d8a442684 100644 --- a/util/cache.cc +++ b/util/cache.cc @@ -12,7 +12,7 @@ #include -#include "include/cache.h" +#include "leveldb/cache.h" #include "port/port.h" #include "util/hash.h" #include "util/mutexlock.h" diff --git a/util/cache_test.cc b/util/cache_test.cc index 05de5d9a9..dbab9881a 100644 --- a/util/cache_test.cc +++ b/util/cache_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/cache.h" +#include "leveldb/cache.h" #include #include "util/coding.h" diff --git a/util/coding.h b/util/coding.h index a42e714c1..87559684a 100644 --- a/util/coding.h +++ b/util/coding.h @@ -13,7 +13,7 @@ #include #include #include -#include "include/slice.h" +#include "leveldb/slice.h" #include "port/port.h" namespace leveldb { diff --git a/util/comparator.cc b/util/comparator.cc index dca3b4d6d..e2b27e3cb 100644 --- a/util/comparator.cc +++ b/util/comparator.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include -#include "include/comparator.h" -#include "include/slice.h" +#include "leveldb/comparator.h" +#include "leveldb/slice.h" #include "util/logging.h" namespace leveldb { diff --git a/util/env.cc b/util/env.cc index 3c2ca89a3..e5297e794 100644 --- a/util/env.cc +++ b/util/env.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/env.h" +#include "leveldb/env.h" namespace leveldb { diff --git a/util/env_chromium.cc b/util/env_chromium.cc index 3cbf190f9..7edc7a9ce 100644 --- a/util/env_chromium.cc +++ b/util/env_chromium.cc @@ -19,8 +19,8 @@ #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "include/env.h" -#include "include/slice.h" +#include "leveldb/env.h" +#include "leveldb/slice.h" #include "port/port.h" #include "util/logging.h" diff --git a/util/env_posix.cc b/util/env_posix.cc index 5c5844909..5cddb0c75 100644 --- a/util/env_posix.cc +++ b/util/env_posix.cc @@ -19,8 +19,8 @@ #if defined(LEVELDB_PLATFORM_ANDROID) #include #endif -#include "include/env.h" -#include "include/slice.h" +#include "leveldb/env.h" +#include "leveldb/slice.h" #include "port/port.h" #include "util/logging.h" diff --git a/util/env_test.cc b/util/env_test.cc index 4d175642a..3c253be18 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/env.h" +#include "leveldb/env.h" #include "port/port.h" #include "util/testharness.h" diff --git a/util/logging.cc b/util/logging.cc index 6b7c410de..5c9bd4abd 100644 --- a/util/logging.cc +++ b/util/logging.cc @@ -8,8 +8,8 @@ #include #include #include -#include "include/env.h" -#include "include/slice.h" +#include "leveldb/env.h" +#include "leveldb/slice.h" namespace leveldb { diff --git a/util/options.cc b/util/options.cc index 9fb7e0a5e..421608bb0 100644 --- a/util/options.cc +++ b/util/options.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "include/options.h" +#include "leveldb/options.h" -#include "include/comparator.h" -#include "include/env.h" +#include "leveldb/comparator.h" +#include "leveldb/env.h" namespace leveldb { diff --git a/util/status.cc b/util/status.cc index 2ed799dc2..d9b7195a8 100644 --- a/util/status.cc +++ b/util/status.cc @@ -4,7 +4,7 @@ #include #include "port/port.h" -#include "include/status.h" +#include "leveldb/status.h" namespace leveldb { diff --git a/util/testharness.h b/util/testharness.h index 93309dcd3..13ab914aa 100644 --- a/util/testharness.h +++ b/util/testharness.h @@ -8,8 +8,8 @@ #include #include #include -#include "include/env.h" -#include "include/slice.h" +#include "leveldb/env.h" +#include "leveldb/slice.h" #include "util/random.h" namespace leveldb { diff --git a/util/testutil.h b/util/testutil.h index 0e8a17771..a150c1a79 100644 --- a/util/testutil.h +++ b/util/testutil.h @@ -5,8 +5,8 @@ #ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_ #define STORAGE_LEVELDB_UTIL_TESTUTIL_H_ -#include "include/env.h" -#include "include/slice.h" +#include "leveldb/env.h" +#include "leveldb/slice.h" #include "util/random.h" namespace leveldb {