hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Use cpputils::TempFile and cpputils::Data instead of blockstore::TempFile and blockstore::Data

Browse Source
This commit is contained in:
Sebastian Messmer 2015-04-25 03:37:25 +02:00
parent 60d1dbc1ab
commit 74e9ffb9f4
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
biicode.conf
View File

@ -7,7 +7,6 @@
messmer/cmake: 3 messmer/cmake: 3
messmer/cpp-utils: 2 messmer/cpp-utils: 2
messmer/fspp: 0 messmer/fspp: 0
messmer/tempfile: 4
[parent] [parent]
messmer/cryfs: 0 messmer/cryfs: 0

4
src/impl/DirBlob.cpp
View File

@ -4,7 +4,7 @@
//TODO Remove and replace with exception hierarchy //TODO Remove and replace with exception hierarchy
#include "messmer/fspp/fuse/FuseErrnoException.h" #include "messmer/fspp/fuse/FuseErrnoException.h"
#include <messmer/blockstore/utils/Data.h> #include <messmer/cpp-utils/data/Data.h>
#include <messmer/blobstore/implementations/onblocks/utils/Math.h> #include <messmer/blobstore/implementations/onblocks/utils/Math.h>
#include "MagicNumbers.h" #include "MagicNumbers.h"
#include "../CryDevice.h" #include "../CryDevice.h"
@ -20,7 +20,7 @@ using std::make_pair;
using blobstore::Blob; using blobstore::Blob;
using blockstore::Key; using blockstore::Key;
using blockstore::Data; using cpputils::Data;
namespace cryfs { namespace cryfs {

4
test/FileSystemTest.cpp
View File

@ -1,6 +1,6 @@
#include <messmer/blockstore/implementations/testfake/FakeBlockStore.h> #include <messmer/blockstore/implementations/testfake/FakeBlockStore.h>
#include <messmer/fspp/fstest/FsTest.h> #include <messmer/fspp/fstest/FsTest.h>
#include <messmer/tempfile/src/TempFile.h> #include <messmer/cpp-utils/tempfile/TempFile.h>
#include "../src/CryDevice.h" #include "../src/CryDevice.h"
@ -25,7 +25,7 @@ public:
return make_unique<CryDevice>(std::move(config), std::move(blockStore)); return make_unique<CryDevice>(std::move(config), std::move(blockStore));
} }
tempfile::TempFile configFile; cpputils::TempFile configFile;
}; };
FSPP_ADD_FILESYTEM_TESTS(CryFS, CryFsTestFixture); FSPP_ADD_FILESYTEM_TESTS(CryFS, CryFsTestFixture);