mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang build errors.

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-01 20:54:22 -04:00
parent a47241b11f
commit 5651e5bb24
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globes/renderableglobe.h
+1 -1
View File
@@ -57,7 +57,7 @@ namespace opengl {
namespace openspace {
struct ReferencedBoolSelection : public properties::SelectionProperty {
ReferencedBoolSelection::ReferencedBoolSelection(const std::string& identifier, const std::string& guiName)
ReferencedBoolSelection(const std::string& identifier, const std::string& guiName)
: properties::SelectionProperty(identifier, guiName) { }
void addOption(const std::string& name, bool* ref) {
modules/globebrowsing/tile/temporaltileprovider.cpp
+3 -2
View File
@@ -227,8 +227,9 @@ namespace openspace {
std::unordered_map<std::string, std::unique_ptr<TimeFormat>> TimeIdProviderFactory::_timeIdProviderMap = 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({ "YYYY-MM-DDThh:mm:ssZ", std::make_unique<YYYY_MM_DDThh_mm_ssZ>() });
_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_DDThh_mm_ssZ>() ));
initialized = true;
}
modules/globebrowsing/tile/tilediskcache.h
+1 -1
View File
@@ -42,7 +42,7 @@ namespace openspace {
std::shared_ptr<TileIOResult> get(const ChunkIndex& chunkIndex);
bool has(const ChunkIndex& chunkIndex) const;
bool TileDiskCache::put(const ChunkIndex& chunkIndex, std::shared_ptr<TileIOResult> tileIOResult);
bool put(const ChunkIndex& chunkIndex, std::shared_ptr<TileIOResult> tileIOResult);
static const std::string CACHE_ROOT;