diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-02-13 17:04:30 +0300 |
| commit | 6022cd015ffe414b60229ba214dc1e324772e22d (patch) | |
| tree | cdff8a4419dd3d9c208f3a137eb3f8971d9a383c /source/blender/collada | |
| parent | d1cd3ec9babd8090089a4c7df6b55573adb1aa48 (diff) | |
Revert "Cleanup/MSVC: Enable C++ conformance mode on compiler versions that support it."
It is breaking compilation on some configurations, revert for now while
i see what is wrong.
This reverts commit 9fe469c110940af5d2525158305d5d365bd15276.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index bc6dd4202b1..14c09a95d10 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -19,7 +19,10 @@ */ #include <algorithm> -#include <iostream> + +#if !defined(WIN32) +# include <iostream> +#endif /* COLLADABU_ASSERT, may be able to remove later */ #include "COLLADABUPlatform.h" |