Fix build errors with c++11

pull/634/head
Andrey Kamaev 12 years ago
parent 6569a58518
commit 2a06fd98c0
  1. 7
      modules/contrib/src/spinimages.cpp
  2. 2
      modules/softcascade/src/_random.hpp

@ -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,

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

Loading…
Cancel
Save