Jenkins compile fix

This commit is contained in:
Alexander Bock
2016-12-04 14:42:23 +01:00
parent 7bc48f859e
commit 6c1bd2c91b
5 changed files with 15 additions and 6 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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 {

View File

@@ -28,6 +28,7 @@
#include <ghoul/misc/boolean.h>
#include <set>
#include <string>
#include <unordered_map>
#include <vector>

View File

@@ -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;
}