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

Adapt to new cpp-utils

This commit is contained in:
Sebastian Messmer 2015-06-21 17:43:45 +02:00
parent d1528fe541
commit 7fae2d1e59
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
implementations/onblocks/BlobStoreOnBlocks.cpp
View File

@ -7,7 +7,7 @@
#include "datatreestore/DataTree.h"
#include "BlobStoreOnBlocks.h"
#include "BlobOnBlocks.h"
#include <messmer/cpp-utils/pointer.h>
#include <messmer/cpp-utils/pointer/cast.h>
using std::unique_ptr;
using std::make_unique;

4
implementations/onblocks/datatreestore/DataTree.cpp
View File

@ -7,8 +7,8 @@
#include "impl/algorithms.h"
#include "messmer/cpp-utils/pointer.h"
#include "messmer/cpp-utils/optional_ownership_ptr.h"
#include "messmer/cpp-utils/pointer/cast.h"
#include "messmer/cpp-utils/pointer/optional_ownership_ptr.h"
#include <cmath>
using blockstore::Key;

2
implementations/onblocks/datatreestore/DataTree.h
View File

@ -4,7 +4,7 @@
#include <memory>
#include <messmer/cpp-utils/macros.h>
#include <messmer/cpp-utils/optional_ownership_ptr.h>
#include <messmer/cpp-utils/pointer/optional_ownership_ptr.h>
#include "../datanodestore/DataNodeView.h"
//TODO Replace with C++14 once std::shared_mutex is supported
#include <boost/thread/shared_mutex.hpp>

2
implementations/onblocks/datatreestore/impl/algorithms.cpp
View File

@ -1,5 +1,5 @@
#include "algorithms.h"
#include <messmer/cpp-utils/pointer.h>
#include <messmer/cpp-utils/pointer/cast.h>
#include <messmer/blockstore/utils/Key.h>
#include "../../datanodestore/DataInnerNode.h"

2
implementations/onblocks/datatreestore/impl/algorithms.h
View File

@ -2,7 +2,7 @@
#ifndef MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_IMPL_ALGORITHMS_H_
#define MESSMER_BLOBSTORE_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_IMPL_ALGORITHMS_H_
#include <messmer/cpp-utils/optional_ownership_ptr.h>
#include <messmer/cpp-utils/pointer/optional_ownership_ptr.h>
namespace blobstore {
namespace onblocks {

2
interface/BlobStore.h
View File

@ -7,7 +7,7 @@
#include <memory>
#include "messmer/blockstore/utils/Key.h"
#include <messmer/cpp-utils/unique_ref.h>
#include <messmer/cpp-utils/pointer/unique_ref.h>
namespace blobstore {

2
test/implementations/onblocks/BlobStoreTest.cpp
View File

@ -1,5 +1,5 @@
#include "testutils/BlobStoreTest.h"
#include <messmer/cpp-utils/unique_ref_boost_optional_gtest_workaround.h>
#include <messmer/cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
using blockstore::Key;
using cpputils::unique_ref;

2
test/implementations/onblocks/datanodestore/DataInnerNodeTest.cpp
View File

@ -8,7 +8,7 @@
#include "messmer/blockstore/implementations/testfake/FakeBlock.h"
#include <memory>
#include "messmer/cpp-utils/pointer.h"
#include "messmer/cpp-utils/pointer/cast.h"
using ::testing::Test;

2
test/implementations/onblocks/datanodestore/DataLeafNodeTest.cpp
View File

@ -4,7 +4,7 @@
#include "../../../../implementations/onblocks/BlobStoreOnBlocks.h"
#include <google/gtest/gtest.h>
#include "messmer/cpp-utils/pointer.h"
#include "messmer/cpp-utils/pointer/cast.h"
#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
#include "messmer/blockstore/implementations/testfake/FakeBlock.h"

2
test/implementations/onblocks/datatreestore/testutils/DataTreeTest.cpp
View File

@ -1,7 +1,7 @@
#include "DataTreeTest.h"
#include "messmer/blockstore/implementations/testfake/FakeBlockStore.h"
#include <messmer/cpp-utils/pointer.h>
#include <messmer/cpp-utils/pointer/cast.h>
using blobstore::onblocks::datanodestore::DataNodeStore;
using blobstore::onblocks::datanodestore::DataNode;

2
test/implementations/onblocks/datatreestore/testutils/TwoLevelDataFixture.h
View File

@ -3,7 +3,7 @@
#define BLOCKS_MESSMER_BLOBSTORE_TEST_IMPLEMENTATIONS_ONBLOCKS_DATATREESTORE_GROWING_TESTUTILS_TWOLEVELDATAFIXTURE_H_
#include <messmer/cpp-utils/macros.h>
#include <messmer/cpp-utils/pointer.h>
#include <messmer/cpp-utils/pointer/cast.h>
#include "LeafDataFixture.h"
//TODO Rename, since we now allow any number of levels