diff --git a/modules/globebrowsing/globes/chunkedlodglobe.cpp b/modules/globebrowsing/globes/chunkedlodglobe.cpp index 9428e2d881..e7fcac0da4 100644 --- a/modules/globebrowsing/globes/chunkedlodglobe.cpp +++ b/modules/globebrowsing/globes/chunkedlodglobe.cpp @@ -79,6 +79,10 @@ ChunkedLodGlobe::ChunkedLodGlobe(const RenderableGlobe& owner, size_t segmentsPe _renderer = std::make_unique(geometry, layerManager); } +// The destructor is defined here to make it feasiable to use a unique_ptr +// with a forward declaration +ChunkedLodGlobe::~ChunkedLodGlobe() {} + bool ChunkedLodGlobe::initialize() { return true; } diff --git a/modules/globebrowsing/globes/chunkedlodglobe.h b/modules/globebrowsing/globes/chunkedlodglobe.h index e12f940d9d..74a820f921 100644 --- a/modules/globebrowsing/globes/chunkedlodglobe.h +++ b/modules/globebrowsing/globes/chunkedlodglobe.h @@ -48,7 +48,8 @@ class ChunkedLodGlobe : public Renderable { public: ChunkedLodGlobe(const RenderableGlobe& owner, size_t segmentsPerPatch, std::shared_ptr layerManager); - + ~ChunkedLodGlobe(); + bool initialize() override; bool deinitialize() override; bool isReady() const override; diff --git a/modules/globebrowsing/other/lrucache.h b/modules/globebrowsing/other/lrucache.h index 039a732fa4..2758ed0c3d 100644 --- a/modules/globebrowsing/other/lrucache.h +++ b/modules/globebrowsing/other/lrucache.h @@ -25,6 +25,7 @@ #ifndef __OPENSPACE_MODULE_GLOBEBROWSING___LRU_CACHE___H__ #define __OPENSPACE_MODULE_GLOBEBROWSING___LRU_CACHE___H__ +#include #include namespace openspace { diff --git a/modules/globebrowsing/other/statscollector.h b/modules/globebrowsing/other/statscollector.h index 80fe510333..447e308ee4 100644 --- a/modules/globebrowsing/other/statscollector.h +++ b/modules/globebrowsing/other/statscollector.h @@ -28,6 +28,7 @@ #include #include +#include #include #include diff --git a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp index a521461984..3e187dc95f 100644 --- a/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp @@ -267,14 +267,16 @@ std::unordered_map> std::unordered_map>(); void TimeIdProviderFactory::init() { - _timeIdProviderMap.insert({ "YYYY-MM-DD" , std::make_unique() }); - _timeIdProviderMap.insert( + _timeIdProviderMap.insert(std::pair>( + { "YYYY-MM-DD" , std::make_unique() } + )); + _timeIdProviderMap.insert(std::pair>( { "YYYY-MM-DDThh:mm:ssZ", std::make_unique() } - ); + )); initialized = true; - _timeIdProviderMap.insert( + _timeIdProviderMap.insert(std::pair>( { "YYYY-MM-DDThh_mm_ssZ", std::make_unique() } - ); + )); initialized = true; }