diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-03-15 08:39:21 -0700 |
|---|---|---|
| committer | Bobby Sudekum <bobby@mapbox.com> | 2017-03-15 08:39:21 -0700 |
| commit | 841da960bccf5aa9c85a1e9549f8697b3645d401 (patch) | |
| tree | 396b94de4eeeee54481dd0ff6769e624a349f448 | |
| parent | a07e6aee045b82e8695616fbd4b08107ddb34f75 (diff) | |
| download | qtlocation-mapboxgl-841da960bccf5aa9c85a1e9549f8697b3645d401.tar.gz | |
[node] Work around a link error on macOS release builds (#8409)
| -rw-r--r-- | include/mbgl/style/layers/custom_layer.hpp | 4 | ||||
| -rw-r--r-- | platform/node/bitrise.yml | 2 | ||||
| -rw-r--r-- | src/mbgl/style/layers/custom_layer.cpp | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index 6bde087820..edc8d43f89 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -65,9 +65,7 @@ public: }; template <> -inline bool Layer::is<CustomLayer>() const { - return type == Type::Custom; -} +bool Layer::is<CustomLayer>() const; } // namespace style } // namespace mbgl diff --git a/platform/node/bitrise.yml b/platform/node/bitrise.yml index 9b066f26b0..68829d966e 100644 --- a/platform/node/bitrise.yml +++ b/platform/node/bitrise.yml @@ -62,6 +62,6 @@ workflows: gem install xcpretty --no-rdoc --no-ri export BUILDTYPE=Release export PUBLISH=true - make node + make test-node ./platform/node/scripts/after_success.sh - slack: *slack diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index 3407a7f5a5..2504f3f15c 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -20,5 +20,10 @@ CustomLayer::CustomLayer(const Impl& other) CustomLayer::~CustomLayer() = default; +template <> +bool Layer::is<CustomLayer>() const { + return type == Type::Custom; +} + } // namespace style } // namespace mbgl |