From a3546210a5dc7dca1a234fb665ded46a8598a858 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 15 Apr 2022 18:06:36 +0100 Subject: No hacky define, types for open maps public for testing --- netfs/fuse/fuseApp.h | 3 +-- netfs/unittests/testCore.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index 5652a41..6b975aa 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -17,7 +17,7 @@ namespace NetFS { class DLL_PUBLIC FuseApp : public FuseAppBaseT { - private: + public: using FuseHandleTypeId = decltype(fuse_file_info::fh); class OpenDir; using OpenDirPtr = std::shared_ptr; @@ -27,7 +27,6 @@ namespace NetFS { using OpenFilePtr = std::shared_ptr; using OpenFiles = std::map; - public: explicit FuseApp(Ice::StringSeq &&); SPECIAL_MEMBERS_DELETE(FuseApp); ~FuseApp() override; diff --git a/netfs/unittests/testCore.cpp b/netfs/unittests/testCore.cpp index f472607..717cc16 100644 --- a/netfs/unittests/testCore.cpp +++ b/netfs/unittests/testCore.cpp @@ -1,6 +1,6 @@ #define BOOST_TEST_MODULE TestNetFSCore #include -#define private public + #include "mockDaemon.h" #include "mockFuse.h" #include @@ -14,8 +14,6 @@ const auto testExport = UniqueExport::get(getpid()); const std::string testEndpoint("tcp -h localhost -p 12012"); const std::string testUri("tcp://localhost:12012/testvol"); -BOOST_TEST_DONT_PRINT_LOG_VALUE(NetFS::FuseApp::OpenFile::BGs::iterator); - bool operator==(const struct stat & a, const struct stat & b) { -- cgit v1.2.3