mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-08 04:31:08 -06:00
Jenkins compile fix
This commit is contained in:
@@ -79,6 +79,10 @@ ChunkedLodGlobe::ChunkedLodGlobe(const RenderableGlobe& owner, size_t segmentsPe
|
||||
_renderer = std::make_unique<ChunkRenderer>(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;
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@ class ChunkedLodGlobe : public Renderable {
|
||||
public:
|
||||
ChunkedLodGlobe(const RenderableGlobe& owner, size_t segmentsPerPatch,
|
||||
std::shared_ptr<LayerManager> layerManager);
|
||||
|
||||
~ChunkedLodGlobe();
|
||||
|
||||
bool initialize() override;
|
||||
bool deinitialize() override;
|
||||
bool isReady() const override;
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___LRU_CACHE___H__
|
||||
#define __OPENSPACE_MODULE_GLOBEBROWSING___LRU_CACHE___H__
|
||||
|
||||
#include <list>
|
||||
#include <unordered_map>
|
||||
|
||||
namespace openspace {
|
||||
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <ghoul/misc/boolean.h>
|
||||
|
||||
#include <set>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
|
||||
@@ -267,14 +267,16 @@ std::unordered_map<std::string, std::unique_ptr<TimeFormat>>
|
||||
std::unordered_map<std::string, std::unique_ptr<TimeFormat>>();
|
||||
|
||||
void TimeIdProviderFactory::init() {
|
||||
_timeIdProviderMap.insert({ "YYYY-MM-DD" , std::make_unique<YYYY_MM_DD>() });
|
||||
_timeIdProviderMap.insert(
|
||||
_timeIdProviderMap.insert(std::pair<std::string, std::unique_ptr<TimeFormat>>(
|
||||
{ "YYYY-MM-DD" , std::make_unique<YYYY_MM_DD>() }
|
||||
));
|
||||
_timeIdProviderMap.insert(std::pair<std::string, std::unique_ptr<TimeFormat>>(
|
||||
{ "YYYY-MM-DDThh:mm:ssZ", std::make_unique<YYYY_MM_DDThhColonmmColonssZ>() }
|
||||
);
|
||||
));
|
||||
initialized = true;
|
||||
_timeIdProviderMap.insert(
|
||||
_timeIdProviderMap.insert(std::pair<std::string, std::unique_ptr<TimeFormat>>(
|
||||
{ "YYYY-MM-DDThh_mm_ssZ", std::make_unique<YYYY_MM_DDThh_mm_ssZ>() }
|
||||
);
|
||||
));
|
||||
initialized = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user