resolve conflict

acelyc111 · Apr 12, 2021 · 1587e7f · 1587e7f
1 parent 017bbe5
commit 1587e7f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/be/test/olap/tablet_meta_manager_test.cpp b/be/test/olap/tablet_meta_manager_test.cpp
@@ -44,8 +44,8 @@ const std::string meta_path = "./be/test/olap/test_data/header_without_inc_rs.tx
 class TabletMetaManagerTest : public testing::Test {
 public:
     virtual void SetUp() {
-        boost::filesystem::remove_all(root_path);
-        ASSERT_TRUE(boost::filesystem::create_directory(root_path));
+        std::filesystem::remove_all(root_path);
+        ASSERT_TRUE(std::filesystem::create_directory(root_path));
         _data_dir = new (std::nothrow) DataDir(root_path);
         ASSERT_NE(nullptr, _data_dir);
         Status st = _data_dir->init();
@@ -64,7 +64,7 @@ class TabletMetaManagerTest : public testing::Test {
 
     virtual void TearDown() {
         delete _data_dir;
-        ASSERT_TRUE(boost::filesystem::remove_all(root_path));
+        ASSERT_TRUE(std::filesystem::remove_all(root_path));
     }
 
 private: