diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-03-20 17:26:11 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-03-20 17:26:11 +0300 |
| commit | 4f97f585135b0e040281e95ca59f6d4a9472d637 (patch) | |
| tree | 9c0ce3d08dc8196e3a54f936c67b9861184bc01d /source/blender/depsgraph | |
| parent | 09c88fed1f58df642c7a13fc5a32057b7160f85c (diff) | |
MSVC: Fix lite build.
MSVC still defines __cplusplus as 199711L until it's in full conformance with the newer c++ standards, however the things we need from the standard are fully supported, hence a check for the msvc version was needed.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_types.h | 1 | ||||
| -rw-r--r-- | source/blender/depsgraph/util/deg_util_function.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h index 2d0b67f7ee6..0e48be6b1e2 100644 --- a/source/blender/depsgraph/intern/depsgraph_types.h +++ b/source/blender/depsgraph/intern/depsgraph_types.h @@ -43,6 +43,7 @@ */ #include <string> #include <vector> +#include <algorithm> struct bAction; struct ChannelDriver; diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h index 1e34ae04d9a..63cd1d6f5eb 100644 --- a/source/blender/depsgraph/util/deg_util_function.h +++ b/source/blender/depsgraph/util/deg_util_function.h @@ -30,7 +30,7 @@ #pragma once -#if (__cplusplus > 199711L) +#if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) #include <functional> |