fix: curvefs/metaserver ut crash when compiling with release mode

Signed-off-by: Ziy1-Tan <[email protected]>
opencurve · Nov 21, 2023 · fe7afba · fe7afba
1 parent 49c9bba
commit fe7afba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/curvefs/test/metaserver/storage/dumpfile_test.cpp b/curvefs/test/metaserver/storage/dumpfile_test.cpp
@@ -39,6 +39,7 @@ namespace storage {
 
 using Hash = std::unordered_map<std::string, std::string>;
 
+namespace {
 class HashIterator : public Iterator {
  public:
     explicit HashIterator(Hash* hash)
@@ -56,6 +57,7 @@ class HashIterator : public Iterator {
     Hash::iterator iter_;
     Hash* hash_;
 };
+}  // namespace
 
 class DumpFileTest : public ::testing::Test {
  protected:

diff --git a/curvefs/test/metaserver/storage/iterator_test.cpp b/curvefs/test/metaserver/storage/iterator_test.cpp
@@ -38,8 +38,8 @@ namespace storage {
 
 using Hash = std::unordered_map<std::string, std::string>;
 using ContainerType = std::map<std::string, std::string>;
-using google::protobuf::util::MessageDifferencer;
 
+namespace {
 class HashIterator : public Iterator {
  public:
     explicit HashIterator(Hash* hash)
@@ -58,6 +58,7 @@ class HashIterator : public Iterator {
     Hash* hash_;
     Hash::iterator iter_;
 };
+}  // namespace
 
 class IteratorTest : public ::testing::Test {
  protected:

diff --git a/nbd b/nbd
+4 −3		src/NBDController.cpp
+1 −1		src/NBDController.h
+7 −1		src/NBDServer.h
+8 −9		src/NBDTool.cpp
+0 −1		src/NBDTool.h
+17 −32		src/main.cpp
+70 −0		src/nbd-netlink.h
+3 −3		test/nbd_server_test.cpp