diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-06-25 00:10:34 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-06-25 16:26:21 +0300 |
| commit | e32b0b7e20179c24ffa12325b4d5e184941acbb8 (patch) | |
| tree | d724bae0b0f3d949cde4b0fed3e879d8c6a9a45d /src/mbgl/util/uv_detail.hpp | |
| parent | be4cb6786babca3368b10e2c1c1aaa9eb43e5663 (diff) | |
| download | qtlocation-mapboxgl-e32b0b7e20179c24ffa12325b4d5e184941acbb8.tar.gz | |
Introduce GLObjectStore
Make a class for keeping GL objects ids and attach it
to the ThreadContext instead of hanging it on the Environment.
Diffstat (limited to 'src/mbgl/util/uv_detail.hpp')
| -rw-r--r-- | src/mbgl/util/uv_detail.hpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mbgl/util/uv_detail.hpp b/src/mbgl/util/uv_detail.hpp index fc72ab6401..f502ee1066 100644 --- a/src/mbgl/util/uv_detail.hpp +++ b/src/mbgl/util/uv_detail.hpp @@ -6,6 +6,13 @@ #include <uv.h> +// XXX: uv.h will include <bits/termios.h> that will +// polute the namespace by defining "B0" which +// will conflict with boost macros. +#ifdef B0 +#undef B0 +#endif + #include <functional> #include <cassert> #include <memory> |