Rename DashboardGlobeLocation to DashboardItemGlobeLocation

Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
This commit is contained in:
Alexander Bock
2018-07-05 12:00:32 -04:00
parent 1916190228
commit ef61dc8c16
56 changed files with 247 additions and 8482 deletions

50
include/openspace/json.h Normal file
View File

@@ -0,0 +1,50 @@
/*****************************************************************************************
* *
* GHOUL *
* General Helpful Open Utility Library *
* *
* Copyright (c) 2012-2018 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___JSON___H__
#define __OPENSPACE_CORE___JSON___H__
#ifdef WIN32
#pragma warning (push)
#pragma warning (disable : 4706) // assignment within conditional expression
#endif // WIN32
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
#pragma GCC diagnostic ignored "-Wuseless-cast"
#endif // __GNUC__
#include <ext/json/json.hpp>
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif // __GNUC__
#ifdef WIN32
#pragma warning (pop)
#endif // WIN32
#endif // __OPENSPACE_CORE___JSON___H__

View File

@@ -364,7 +364,7 @@ public:
* succeeds iff \p body is the name of a valid body, \p value is a value associated
* with the body, and the value consists of three \c double values. If all conditions
* are true, the value is retrieved using the method \c bodvrd_c and stored in \p v.
*
*
* \param body The name of the body whose value should be retrieved or the NAIF ID of
* this body
* \param value The value that should be retrieved, this value is case-sensitive

View File

@@ -27,7 +27,7 @@
namespace openspace {
template<class T>
SyncData<T>::SyncData(const T& val) : data(val) {};
SyncData<T>::SyncData(const T& val) : data(val) {}
template<class T>
SyncData<T>::SyncData(const SyncData<T>& o) : data(o.data) {}
@@ -70,6 +70,6 @@ void SyncData<T>::postSync(bool isMaster) {
data = doubleBufferedData;
_mutex.unlock();
}
};
}
} // namespace openspace