Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

re-added ConstructionGuard

This commit is contained in:
jsteemann 2017-03-17 15:12:14 +01:00
parent fa26d8ca6c
commit a2a14652b2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Views/LoggerView.cpp
View File

@ -75,10 +75,10 @@ std::unique_ptr<ViewImplementation> LoggerView::creator(
LogicalView* view, arangodb::velocypack::Slice const& info) {
LOG_TOPIC(INFO, Logger::FIXME) << "called LoggerView::creator";
return std::make_unique<LoggerView>(view, info);
return std::make_unique<LoggerView>(ConstructionGuard(), view, info);
}
LoggerView::LoggerView(LogicalView* logical,
LoggerView::LoggerView(ConstructionGuard const&, LogicalView* logical,
arangodb::velocypack::Slice const& info)
: ViewImplementation(logical, info) {
VPackSlice properties = info.get("properties");

9
arangod/Views/LoggerView.h
View File

@ -42,8 +42,15 @@ class LoggerView final : public ViewImplementation {
static std::unique_ptr<ViewImplementation> creator(
LogicalView*, arangodb::velocypack::Slice const&);
private:
// private struct that does not do anything
// we require it in the constructor of LoggerView so we
// can ensure any constructor calls are coming from the
// LoggerView's creator method
struct ConstructionGuard {};
public:
LoggerView(LogicalView* logical,
LoggerView(ConstructionGuard const&, LogicalView* logical,
arangodb::velocypack::Slice const& info);
~LoggerView() = default;