Drawable Renderer (#1570), fix build issues
This commit is contained in:
committed by
Bart Louwers
parent
b73f101d11
commit
5a9946733b
@@ -905,6 +905,7 @@ list(APPEND SRC_FILES
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.cpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/dtoa.hpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/event.cpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/filesystem.hpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp
|
||||
${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp
|
||||
|
||||
@@ -493,6 +493,7 @@ MLN_CORE_SOURCE = [
|
||||
"src/mbgl/util/dtoa.cpp",
|
||||
"src/mbgl/util/dtoa.hpp",
|
||||
"src/mbgl/util/event.cpp",
|
||||
"src/mbgl/util/filesystem.hpp",
|
||||
"src/mbgl/util/font_stack.cpp",
|
||||
"src/mbgl/util/geo.cpp",
|
||||
"src/mbgl/util/geojson_impl.cpp",
|
||||
|
||||
@@ -145,8 +145,7 @@ public:
|
||||
|
||||
VertexAttributeArray(int initCapacity = 10);
|
||||
VertexAttributeArray(VertexAttributeArray&&);
|
||||
// Would need to use the virtual assignment operator
|
||||
VertexAttributeArray(const VertexAttributeArray&);
|
||||
VertexAttributeArray(const VertexAttributeArray&) = delete; // Would need to use the virtual assignment operator
|
||||
virtual ~VertexAttributeArray() = default;
|
||||
|
||||
/// Number of elements
|
||||
|
||||
@@ -689,7 +689,7 @@ TestRunner::Impl::Impl(const TestMetadata& metadata,
|
||||
fileSource(mbgl::FileSourceManager::get()->getFileSource(
|
||||
mbgl::FileSourceType::ResourceLoader, resourceOptions, clientOptions)),
|
||||
map(frontend,
|
||||
*observer.get(),
|
||||
*observer,
|
||||
mbgl::MapOptions()
|
||||
.withMapMode(metadata.mapMode)
|
||||
.withSize(metadata.size)
|
||||
|
||||
@@ -12,10 +12,6 @@ std::unique_ptr<VertexAttribute> VertexAttributeArray::nullref = nullptr;
|
||||
VertexAttributeArray::VertexAttributeArray(int initCapacity)
|
||||
: attrs(initCapacity) {}
|
||||
|
||||
VertexAttributeArray::VertexAttributeArray(const VertexAttributeArray& other) {
|
||||
operator=(other);
|
||||
}
|
||||
|
||||
VertexAttributeArray::VertexAttributeArray(VertexAttributeArray&& other)
|
||||
: attrs(std::move(other.attrs)) {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user