This commit is contained in:
Claudius Holeksa 2021-12-18 14:25:02 +01:00
parent 7238863776
commit 8d5a54a37d
5 changed files with 15 additions and 21 deletions

View File

@ -183,7 +183,7 @@ public:
* Useful for resource lifetime control.
*/
template <typename... Args>
[[nodiscard]] Conveyor<T> attach(Args &&...args);
[[nodiscard]] Conveyor<T> attach(Args &&... args);
/** @todo implement
* This method limits the total amount of passed elements
@ -601,7 +601,7 @@ private:
std::tuple<Args...> attached_data;
public:
AttachConveyorNode(Own<ConveyorNode> &&dep, Args &&...args)
AttachConveyorNode(Own<ConveyorNode> &&dep, Args &&... args)
: AttachConveyorNodeBase(std::move(dep)), attached_data{
std::move(args...)} {}
};

View File

@ -73,7 +73,7 @@ template <typename T> Conveyor<T> Conveyor<T>::buffer(size_t size) {
template <typename T>
template <typename... Args>
Conveyor<T> Conveyor<T>::attach(Args &&...args) {
Conveyor<T> Conveyor<T>::attach(Args &&... args) {
Own<AttachConveyorNode<Args...>> attach_node =
heap<AttachConveyorNode<Args...>>(std::move(node), std::move(args...));
return Conveyor<T>{std::move(attach_node), storage};

View File

@ -39,11 +39,11 @@ template <typename T> using Our = std::shared_ptr<T>;
template <typename T> using Lent = std::weak_ptr<T>;
template <typename T, class... Args> Own<T> heap(Args &&...args) {
template <typename T, class... Args> Own<T> heap(Args &&... args) {
return Own<T>(new T(std::forward<Args>(args)...));
}
template <typename T, class... Args> Our<T> share(Args &&...args) {
template <typename T, class... Args> Our<T> share(Args &&... args) {
return std::make_shared<T>(std::forward<Args>(args)...);
}

View File

@ -835,9 +835,7 @@ Error JsonCodec::decodeValue(Own<DynamicMessage> &message, Buffer &buffer,
decodeNull(buffer);
message = std::move(msg_null);
} break;
default: {
return criticalError("Cannot identify next JSON value");
}
default: { return criticalError("Cannot identify next JSON value"); }
}
skipWhitespace(buffer);

View File

@ -122,13 +122,9 @@ public:
}
};
Builder build(){
return Builder{*this};
}
Builder build() { return Builder{*this}; }
Reader read(){
return Reader{*this};
}
Reader read() { return Reader{*this}; }
};
/*
@ -375,19 +371,20 @@ public:
}
};
template<class Schema, class Container = MessageContainer<Schema>>
template <class Schema, class Container = MessageContainer<Schema>>
class HeapMessageRoot {
private:
Own<Message<Schema, Container>> root;
public:
HeapMessageRoot(Own<Message<Schema,Container>> r):root{std::move(r)}{}
typename Message<Schema, Container>::Builder build(){
public:
HeapMessageRoot(Own<Message<Schema, Container>> r) : root{std::move(r)} {}
typename Message<Schema, Container>::Builder build() {
assert(root);
return root->build();
}
typename Message<Schema, Container>::Reader read(){
typename Message<Schema, Container>::Reader read() {
assert(root);
return root->read();
}
@ -396,10 +393,9 @@ public:
/*
* Minor helper for creating a message root
*/
template<class Schema, class Container = MessageContainer<Schema>>
template <class Schema, class Container = MessageContainer<Schema>>
inline HeapMessageRoot heapMessageRoot() {
Own<Message<Schema, Container>> root = heap<Message<Schema, Container>>();
return HeapMessageRoot<Schema, Container>{std::move(root)};
}
} // namespace gin