projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e47f58f)
fix android build
authormarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 9 Jan 2013 13:23:21 +0000 (17:23 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Fri, 1 Feb 2013 10:34:40 +0000 (14:34 +0400)
apps/sft/include/sft/random.hpp patch | blob | history
modules/ml/src/octave.cpp patch | blob | history

diff --git a/apps/sft/include/sft/random.hpp b/apps/sft/include/sft/random.hpp
index e184da6..3a3be8b 100644 (file)
--- a/apps/sft/include/sft/random.hpp
+++ b/apps/sft/include/sft/random.hpp
@@ -54,7 +54,7 @@ struct Random
 };
 }
 
-#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1
+#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__)
 
 # if defined (__cplusplus) && __cplusplus > 201100L
 #  include <random>
diff --git a/modules/ml/src/octave.cpp b/modules/ml/src/octave.cpp
index d9a2db3..bf37ba9 100644 (file)
--- a/modules/ml/src/octave.cpp
+++ b/modules/ml/src/octave.cpp
@@ -64,7 +64,7 @@ struct Random
 };
 }
 
-#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1
+#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__)
 
 # if defined (__cplusplus) && __cplusplus > 201100L
 #  include <random>
Domain: Multimedia / Media Vision;