Fix build with STLPort from NDK r8d

2012-12-21 19:58:51 +04:00
parent ffdbddd6b1
commit 9944282b09
18 changed files with 47 additions and 33 deletions
--- a/modules/contrib/src/spinimages.cpp
+++ b/modules/contrib/src/spinimages.cpp
@@ -85,7 +85,7 @@ namespace
    };
    size_t colors_mum = sizeof(colors)/sizeof(colors[0]);

-#if defined __cplusplus  && __cplusplus > 199711L
+#if (defined __cplusplus  && __cplusplus > 199711L) || defined _STLPORT_MAJOR
 #else
 template<class FwIt, class T> void iota(FwIt first, FwIt last, T value) { while(first != last) *first++ = value++; }
 #endif