diff --git a/modules/contrib/src/spinimages.cpp b/modules/contrib/src/spinimages.cpp index ae7914f612..7f7a8ad63f 100644 --- a/modules/contrib/src/spinimages.cpp +++ b/modules/contrib/src/spinimages.cpp @@ -77,16 +77,9 @@ namespace }; size_t colors_mum = sizeof(colors)/sizeof(colors[0]); -namespace { - template inline void _iota(FwIt first, FwIt last, T value) { -#if (defined __cplusplus && __cplusplus > 199711L) || defined _STLPORT_MAJOR - std::iota(first, last, value); -#else while(first != last) *first++ = value++; -#endif -} } void computeNormals( const Octree& Octree, const std::vector& centers, std::vector& normals, diff --git a/modules/softcascade/src/_random.hpp b/modules/softcascade/src/_random.hpp index 3e13d03b6b..63fa2565f8 100644 --- a/modules/softcascade/src/_random.hpp +++ b/modules/softcascade/src/_random.hpp @@ -58,7 +58,7 @@ struct Random }}} -#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__) && !defined(__APPLE__) +#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__) # if defined (__cplusplus) && __cplusplus > 201100L # include