Skip to content

Commit

Permalink
Fix formating
Browse files Browse the repository at this point in the history
  • Loading branch information
TheMarex committed Apr 6, 2018
1 parent 99bee5f commit 92c0f77
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions include/engine/data_watchdog.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
facade_factory =
DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
std::make_shared<datafacade::SharedMemoryAllocator>(
std::vector<storage::SharedRegionRegister::ShmKey> {static_region.shm_key, updatable_region.shm_key}));
std::vector<storage::SharedRegionRegister::ShmKey>{
static_region.shm_key, updatable_region.shm_key}));
}

watcher = std::thread(&DataWatchdogImpl::Run, this);
Expand Down Expand Up @@ -113,7 +114,8 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
facade_factory =
DataFacadeFactory<datafacade::ContiguousInternalMemoryDataFacade, AlgorithmT>(
std::make_shared<datafacade::SharedMemoryAllocator>(
std::vector<storage::SharedRegionRegister::ShmKey>{static_region.shm_key, updatable_region.shm_key}));
std::vector<storage::SharedRegionRegister::ShmKey>{
static_region.shm_key, updatable_region.shm_key}));
}

util::Log() << "DataWatchdog thread stopped";
Expand Down
3 changes: 2 additions & 1 deletion include/engine/datafacade/shared_memory_allocator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ namespace datafacade
class SharedMemoryAllocator : public ContiguousBlockAllocator
{
public:
explicit SharedMemoryAllocator(const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys);
explicit SharedMemoryAllocator(
const std::vector<storage::SharedRegionRegister::ShmKey> &shm_keys);
~SharedMemoryAllocator() override final;

// interface to give access to the datafacades
Expand Down
2 changes: 1 addition & 1 deletion include/storage/storage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef STORAGE_HPP
#define STORAGE_HPP

#include "storage/shared_datatype.hpp"
#include "storage/shared_data_index.hpp"
#include "storage/shared_datatype.hpp"
#include "storage/storage_config.hpp"

#include <boost/filesystem/path.hpp>
Expand Down
5 changes: 3 additions & 2 deletions include/storage/view_factory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ util::vector_view<T> make_vector_view(const SharedDataIndex &index, const std::s
return util::vector_view<T>(index.GetBlockPtr<T>(name), index.GetBlockEntries(name));
}

template<>
inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index, const std::string &name)
template <>
inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index,
const std::string &name)
{
return util::vector_view<bool>(index.GetBlockPtr<util::vector_view<bool>::Word>(name),
index.GetBlockEntries(name));
Expand Down

0 comments on commit 92c0f77

Please sign in to comment.