fix android build

e35eebd4 · marina.kolpakova · e47f58f4 · e35eebd4 · e35eebd4
Commit e35eebd4 authored Jan 09, 2013 by marina.kolpakova
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

random.hpp apps/sft/include/sft/random.hpp +1 -1

octave.cpp modules/ml/src/octave.cpp +1 -1

No files found.
--- 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>

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