Unverified Commit 902ad7e9 authored by Dominik Charousset's avatar Dominik Charousset Committed by GitHub

Merge pull request #758

Add timespan to builtin types, close #757
parents 710eccb4 56de5632
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
#include "caf/fwd.hpp"
#include "caf/atom.hpp" #include "caf/atom.hpp"
#include "caf/fwd.hpp"
#include "caf/timespan.hpp"
#include "caf/timestamp.hpp" #include "caf/timestamp.hpp"
#include "caf/detail/type_list.hpp" #include "caf/detail/type_list.hpp"
...@@ -65,6 +66,7 @@ using sorted_builtin_types = ...@@ -65,6 +66,7 @@ using sorted_builtin_types =
std::set<std::string>, // @strset std::set<std::string>, // @strset
std::vector<std::string>, // @strvec std::vector<std::string>, // @strvec
timeout_msg, // @timeout timeout_msg, // @timeout
timespan, // @timespan
timestamp, // @timestamp timestamp, // @timestamp
uint16_t, // @u16 uint16_t, // @u16
std::u16string, // @u16_str std::u16string, // @u16_str
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "caf/message_builder.hpp" #include "caf/message_builder.hpp"
#include "caf/proxy_registry.hpp" #include "caf/proxy_registry.hpp"
#include "caf/string_algorithms.hpp" #include "caf/string_algorithms.hpp"
#include "caf/timespan.hpp"
#include "caf/timestamp.hpp" #include "caf/timestamp.hpp"
#include "caf/type_nr.hpp" #include "caf/type_nr.hpp"
#include "caf/upstream_msg.hpp" #include "caf/upstream_msg.hpp"
...@@ -81,6 +82,7 @@ const char* numbered_type_names[] = { ...@@ -81,6 +82,7 @@ const char* numbered_type_names[] = {
"@strset", "@strset",
"@strvec", "@strvec",
"@timeout", "@timeout",
"@timespan",
"@timestamp", "@timestamp",
"@u16", "@u16",
"@u16str", "@u16str",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment