Merge pull request #634 from taka-no-me:c++11-master

modules/contrib/src/spinimages.cpp

@@ -77,16 +77,9 @@ namespace
     };
     size_t colors_mum = sizeof(colors)/sizeof(colors[0]);
 
-namespace {
-
 template<class FwIt, class T> 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<Point3f>& centers, std::vector<Point3f>& normals,

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 <random>