diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-04-15 18:06:36 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2022-04-15 18:06:36 +0100 |
| commit | a3546210a5dc7dca1a234fb665ded46a8598a858 (patch) | |
| tree | a3a84349aba42469d70eb27dac2aa6afe3fe96c0 | |
| parent | Enable and fixup all conversion/cast warnings (diff) | |
| download | netfs-a3546210a5dc7dca1a234fb665ded46a8598a858.tar.bz2 netfs-a3546210a5dc7dca1a234fb665ded46a8598a858.tar.xz netfs-a3546210a5dc7dca1a234fb665ded46a8598a858.zip | |
No hacky define, types for open maps public for testing
| -rw-r--r-- | netfs/fuse/fuseApp.h | 3 | ||||
| -rw-r--r-- | 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<FuseApp> { - private: + public: using FuseHandleTypeId = decltype(fuse_file_info::fh); class OpenDir; using OpenDirPtr = std::shared_ptr<OpenDir>; @@ -27,7 +27,6 @@ namespace NetFS { using OpenFilePtr = std::shared_ptr<OpenFile>; using OpenFiles = std::map<FuseHandleTypeId, OpenFilePtr>; - 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 <boost/test/unit_test.hpp> -#define private public + #include "mockDaemon.h" #include "mockFuse.h" #include <algorithm> @@ -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) { |