diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:29:05 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:30:06 +0300 |
| commit | 18bff53c997f5bfac0435b8a03ee967eed8c9e20 (patch) | |
| tree | b0d3b788a7e2a64f746ba96e3456f01d7b274ca2 /source/blender/depsgraph/intern/depsgraph_type.h | |
| parent | 4fc5233467b1c273cdb82b221d8faa53249b99c6 (diff) | |
BLI: remove blender::Optional in favor of std::optional
`std::optional` can be used now, because we switched to C++17.
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_type.h')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_type.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_type.h b/source/blender/depsgraph/intern/depsgraph_type.h index 12150320391..5439a9dd31c 100644 --- a/source/blender/depsgraph/intern/depsgraph_type.h +++ b/source/blender/depsgraph/intern/depsgraph_type.h @@ -54,7 +54,6 @@ namespace DEG { /* Commonly used types. */ using blender::Map; -using blender::Optional; using blender::Set; using blender::Span; using blender::StringRef; @@ -62,6 +61,7 @@ using blender::StringRefNull; using blender::Vector; using blender::VectorSet; using std::deque; +using std::optional; using std::pair; using std::string; using std::unique_ptr; |