diff options
| author | Wouter van Oortmerssen <wvo@google.com> | 2016-07-21 00:55:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-21 00:55:05 +0000 |
| commit | 77e912268162688f260e870e7d21c7b975484a89 (patch) | |
| tree | 2758584cf3920d37840b4b932b3a133a556ab5b5 /tests | |
| parent | e067040375c22c8ba41e2c5a6e8c14b7e00095aa (diff) | |
| parent | 7c7c571bbec3e698b17a191cb5616f94b05cd864 (diff) | |
| download | flatbuffers-77e912268162688f260e870e7d21c7b975484a89.tar.gz flatbuffers-77e912268162688f260e870e7d21c7b975484a89.tar.bz2 flatbuffers-77e912268162688f260e870e7d21c7b975484a89.zip | |
Merge "This is a minimal amount of #ifdef's to make stlport work." into ub-games-master
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/test.cpp b/tests/test.cpp index 11aea177..37ed4c11 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -25,7 +25,9 @@ #include "namespace_test/namespace_test1_generated.h" #include "namespace_test/namespace_test2_generated.h" -#include <random> +#ifndef FLATBUFFERS_CPP98_STL + #include <random> +#endif using namespace MyGame::Example; |