From c80f3e9d29d1c26ccc88ef30f8f17329c9bfb1b7 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 11 May 2017 14:51:08 -0700 Subject: [linux] loop-uv depends on mbgl-core for linking --- cmake/loop-uv.cmake | 4 ++++ src/mbgl/style/source_impl.hpp | 3 ++- src/mbgl/util/longest_common_subsequence.hpp | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/loop-uv.cmake b/cmake/loop-uv.cmake index 0f55fce64c..182b0d6f90 100644 --- a/cmake/loop-uv.cmake +++ b/cmake/loop-uv.cmake @@ -14,4 +14,8 @@ target_include_directories(mbgl-loop-uv PRIVATE src ) +target_link_libraries(mbgl-loop-uv + PRIVATE mbgl-core +) + create_source_groups(mbgl-loop-uv) diff --git a/src/mbgl/style/source_impl.hpp b/src/mbgl/style/source_impl.hpp index 52d5036fae..42da97345a 100644 --- a/src/mbgl/style/source_impl.hpp +++ b/src/mbgl/style/source_impl.hpp @@ -17,6 +17,8 @@ class Source::Impl { public: virtual ~Impl() = default; + Impl& operator=(const Impl&) = delete; + virtual optional getAttribution() const = 0; const SourceType type; @@ -25,7 +27,6 @@ public: protected: Impl(SourceType, std::string); Impl(const Impl&) = default; - Impl& operator=(const Impl&) = delete; }; } // namespace style diff --git a/src/mbgl/util/longest_common_subsequence.hpp b/src/mbgl/util/longest_common_subsequence.hpp index ac127c6356..522b5a86b1 100644 --- a/src/mbgl/util/longest_common_subsequence.hpp +++ b/src/mbgl/util/longest_common_subsequence.hpp @@ -103,4 +103,4 @@ OutIt longest_common_subsequence(InIt a, InIt endA, return longest_common_subsequence(a, endA, b, endB, outIt, std::equal_to<>()); } -} +} // namespace mbgl -- cgit v1.2.1