cleanup boost include files

project-tsurugi · Dec 18, 2023 · 95061f9 · 95061f9
1 parent 43bec1c
commit 95061f9
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 30 deletions.
diff --git a/include/limestone/api/backup.h b/include/limestone/api/backup.h
@@ -18,7 +18,7 @@
 #include <vector>
 #include <set>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/api/log_channel.h>
 

diff --git a/include/limestone/api/backup_detail.h b/include/limestone/api/backup_detail.h
@@ -20,7 +20,7 @@
 #include <string_view>
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/api/epoch_id_type.h>
 

diff --git a/include/limestone/api/configuration.h b/include/limestone/api/configuration.h
@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 namespace limestone::api {
 

diff --git a/include/limestone/api/cursor.h b/include/limestone/api/cursor.h
@@ -18,8 +18,8 @@
 #include <memory>
 #include <vector>
 
-#include <boost/filesystem/path.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include <limestone/api/storage_id_type.h>
 #include <limestone/api/large_object_view.h>

diff --git a/include/limestone/api/datastore.h b/include/limestone/api/datastore.h
@@ -23,7 +23,7 @@
 #include <set>
 #include <mutex>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/status.h>
 #include <limestone/api/backup.h>

diff --git a/include/limestone/api/file_set_entry.h b/include/limestone/api/file_set_entry.h
@@ -17,7 +17,7 @@
 
 #include <string_view>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 
 namespace limestone::api {

diff --git a/include/limestone/api/large_object_input.h b/include/limestone/api/large_object_input.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
 namespace limestone::api {
 

diff --git a/include/limestone/api/log_channel.h b/include/limestone/api/log_channel.h
@@ -21,8 +21,7 @@
 #include <cstdint>
 #include <atomic>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/status.h>
 #include <limestone/api/storage_id_type.h>

diff --git a/include/limestone/api/snapshot.h b/include/limestone/api/snapshot.h
@@ -18,8 +18,7 @@
 #include <memory>
 #include <string_view>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/api/cursor.h>
 

diff --git a/src/limestone/datastore.cpp b/src/limestone/datastore.cpp
@@ -18,7 +18,7 @@
 #include <iomanip>
 #include <stdexcept>
 
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
 
 #include <glog/logging.h>
 #include <limestone/logging.h>

diff --git a/src/limestone/datastore_format.cpp b/src/limestone/datastore_format.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem.hpp>
 #include <nlohmann/json.hpp>
 
 #include <glog/logging.h>

diff --git a/src/limestone/datastore_restore.cpp b/src/limestone/datastore_restore.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <boost/filesystem/operations.hpp>
 
 #include <glog/logging.h>
 #include <limestone/logging.h>

diff --git a/src/limestone/datastore_snapshot.cpp b/src/limestone/datastore_snapshot.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <byteswap.h>
-#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <cstdlib>
 #include <cstring>
 #include <mutex>

diff --git a/src/limestone/internal.h b/src/limestone/internal.h
@@ -16,6 +16,8 @@
 
 #include <optional>
 
+#include <boost/filesystem.hpp>
+
 #include <limestone/api/datastore.h>
 
 namespace limestone::internal {

diff --git a/src/limestone/log_entry.h b/src/limestone/log_entry.h
@@ -15,15 +15,14 @@
  */
 #pragma once
 
+#include <cassert>
 #include <cstdio>
 #include <endian.h>
 #include <istream>
 #include <string>
 #include <string_view>
 #include <exception>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
 #include <glog/logging.h>
 
 #include <limestone/api/storage_id_type.h>

diff --git a/src/limestone/snapshot.cpp b/src/limestone/snapshot.cpp
@@ -19,8 +19,6 @@
 #include <limestone/logging.h>
 #include "logging_helper.h"
 
-#include <boost/filesystem.hpp>
-
 namespace limestone::api {  // FIXME fill implementation
 
 snapshot::snapshot(const boost::filesystem::path& location) noexcept : dir_(location / boost::filesystem::path(std::string(subdirectory_name_))) {

diff --git a/src/limestone/sortdb_wrapper.h b/src/limestone/sortdb_wrapper.h
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// #include <boost/filesystem/operations.hpp>
+
+#include <boost/filesystem.hpp>
 
 #ifdef SORT_METHOD_USE_ROCKSDB
 #include <rocksdb/db.h>

diff --git a/test/limestone/log/durable_test.cpp b/test/limestone/log/durable_test.cpp
@@ -3,8 +3,7 @@
 #include <sstream>
 #include <limestone/logging.h>
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem.hpp>
 
 #include "internal.h"
 #include "log_entry.h"

diff --git a/test/limestone/log/log_dir_test.cpp b/test/limestone/log/log_dir_test.cpp
@@ -1,6 +1,5 @@
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/fstream.hpp>
+#include <boost/filesystem.hpp>
 
 #include <limestone/logging.h>
 

diff --git a/test/limestone/log/log_entry_4_LevelDB_test.cpp b/test/limestone/log/log_entry_4_LevelDB_test.cpp
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include "test_root.h"
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include "log_entry.h"

diff --git a/test/limestone/log/log_entry_test.cpp b/test/limestone/log/log_entry_test.cpp
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include "test_root.h"
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include "log_entry.h"

diff --git a/test/limestone/log/log_entry_type_test.cpp b/test/limestone/log/log_entry_type_test.cpp
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include "test_root.h"
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include "log_entry.h"

diff --git a/test/limestone/log/rotate_test.cpp b/test/limestone/log/rotate_test.cpp
@@ -2,7 +2,7 @@
 #include <sstream>
 #include <limestone/logging.h>
 
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 
 #include "internal.h"

diff --git a/test/test_root.h b/test/test_root.h
@@ -17,8 +17,6 @@
 #include <gtest/gtest.h>
 #include <glog/logging.h>
 
-#include <boost/filesystem/path.hpp>
-
 #include <limestone/api/datastore.h>
 #include <limestone/api/configuration.h>