diff options
author | Jason Wray <jason@mapbox.com> | 2019-09-11 21:15:17 -0700 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2019-09-11 21:25:27 -0700 |
commit | cfeda5a3d3be4ab17129a52766778ebdfe281aeb (patch) | |
tree | 98ad23a81a28d7327e3234a1c4076314967fce1d | |
parent | 53e56945ebef1bd1ccfff724223aba2de5fca058 (diff) | |
download | qtlocation-mapboxgl-upstream/friedbunny-__FILE_NAME__.tar.gz |
Try out __FILE_NAME__upstream/friedbunny-__FILE_NAME__
-rw-r--r-- | circle.yml | 2 | ||||
-rw-r--r-- | include/mbgl/platform/gl_functions.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml index 453aab85ac..0d5efdd13d 100644 --- a/circle.yml +++ b/circle.yml @@ -1152,7 +1152,7 @@ jobs: # ------------------------------------------------------------------------------ ios-release-template: macos: - xcode: "10.3.0" + xcode: "11.0.0" environment: BUILDTYPE: Release HOMEBREW_NO_AUTO_UPDATE: 1 diff --git a/include/mbgl/platform/gl_functions.hpp b/include/mbgl/platform/gl_functions.hpp index fab3e3aa36..818dd41667 100644 --- a/include/mbgl/platform/gl_functions.hpp +++ b/include/mbgl/platform/gl_functions.hpp @@ -6,7 +6,7 @@ // initialized by the platform at linking time. #ifndef NDEBUG -#define MBGL_CHECK_ERROR(cmd) ([&]() { struct __MBGL_CHECK_ERROR { ~__MBGL_CHECK_ERROR() noexcept(false) { mbgl::platform::glCheckError(#cmd, __FILE__, __LINE__); } } __MBGL_CHECK_ERROR; return cmd; }()) +#define MBGL_CHECK_ERROR(cmd) ([&]() { struct __MBGL_CHECK_ERROR { ~__MBGL_CHECK_ERROR() noexcept(false) { mbgl::platform::glCheckError(#cmd, __FILE_NAME__, __LINE__); } } __MBGL_CHECK_ERROR; return cmd; }()) #else #define MBGL_CHECK_ERROR(cmd) (cmd) #endif @@ -334,4 +334,4 @@ void glCheckError(const char *cmd, const char *file, int line); #endif } // namespace platform -} // namespace mbgl
\ No newline at end of file +} // namespace mbgl |