generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build errors with c++11

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-11 16:03:48 +04:00
parent 6569a58518
commit 2a06fd98c0
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/contrib/src/spinimages.cpp
View File

@ -77,16 +77,9 @@ namespace
}; };
size_t colors_mum = sizeof(colors)/sizeof(colors[0]); size_t colors_mum = sizeof(colors)/sizeof(colors[0]);
namespace {
template<class FwIt, class T> inline void _iota(FwIt first, FwIt last, T value) 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++; while(first != last) *first++ = value++;
#endif
}
} }
void computeNormals( const Octree& Octree, const std::vector<Point3f>& centers, std::vector<Point3f>& normals, void computeNormals( const Octree& Octree, const std::vector<Point3f>& centers, std::vector<Point3f>& normals,

2
modules/softcascade/src/_random.hpp
View File

@ -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 # if defined (__cplusplus) && __cplusplus > 201100L
# include <random> # include <random>