Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
902ad7e9
Unverified
Commit
902ad7e9
authored
Sep 14, 2018
by
Dominik Charousset
Committed by
GitHub
Sep 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #758
Add timespan to builtin types, close #757
parents
710eccb4
56de5632
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
libcaf_core/caf/type_nr.hpp
libcaf_core/caf/type_nr.hpp
+3
-1
libcaf_core/src/uniform_type_info_map.cpp
libcaf_core/src/uniform_type_info_map.cpp
+2
-0
No files found.
libcaf_core/caf/type_nr.hpp
View file @
902ad7e9
...
@@ -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
...
...
libcaf_core/src/uniform_type_info_map.cpp
View file @
902ad7e9
...
@@ -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"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment