Remove Clang warnings

This commit is contained in:
Alexander Bock
2018-09-25 12:23:55 -04:00
parent 0ca84d91f1
commit 4ed9fec9f9
10 changed files with 11 additions and 11 deletions

View File

@@ -122,7 +122,6 @@ private:
ReadyState _readyState;
Progress _progress;
RequestOptions _options;
friend size_t curlfunctions::writeCallback(char* ptr, size_t size, size_t nmemb,
void* userData);

View File

@@ -22,8 +22,6 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#pragma optimize ("", off)
#include <modules/spacecraftinstruments/util/projectioncomponent.h>
#include <modules/spacecraftinstruments/util/hongkangparser.h>

View File

@@ -46,13 +46,14 @@
#pragma warning (pop)
#endif // _MSC_VER
#endif // SYNC_USE_LIBTORRENT
namespace {
constexpr const char* _loggerCat = "TorrentClient";
constexpr const std::chrono::milliseconds PollInterval(1000);
} // namespace
#endif // SYNC_USE_LIBTORRENT
namespace openspace {
TorrentError::TorrentError(std::string msg)

View File

@@ -102,10 +102,12 @@ private:
void notify(TorrentId id);
void pollAlerts();
#ifdef SYNC_USE_LIBTORRENT
libtorrent::session _session;
bool _isInitialized = false;
std::atomic_bool _isActive = false;
#endif // SYNC_USE_LIBTORRENT
std::thread _torrentThread;
std::condition_variable _abortNotifier;
std::mutex _abortMutex;

View File

@@ -1326,6 +1326,7 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
"clusterId",
&luascriptfunctions::clusterId,
{},
"",
"Returns the zero-based identifier for this OpenSpace instance in a "
"cluster configuration. If this instance is not part of a cluster, this "
"identifier is always 0."

View File

@@ -31,6 +31,8 @@
namespace openspace::properties {
int _StubToPreventLinkerWarningAboutMissingExportSymbols;
// #define DEFAULT_FROM_LUA_LAMBDA(wchar_t, DEFAULT_VALUE)
// [](lua_State* state, bool& success) -> wchar_t {
// success = (lua_isnumber(state, -1) == 1);

View File

@@ -986,4 +986,6 @@ void ABufferRenderer::saveTextureToMemory(GLenum color_buffer_attachment, int wi
} // namespace openspace
#else
int _StubToPreventLinkerWarningAboutMissingExportSymbols;
#endif // OPENSPACE_WITH_ABUFFER_RENDERER

View File

@@ -262,7 +262,6 @@ void deinitialize() {
}
glm::mat4 ortho(const glm::vec2& position, const glm::vec2& size, Anchor anchor) {
glm::ivec2 res = global::windowDelegate.currentDrawBufferResolution();
const float xSize = size.x;
const float ySize = size.y;
float xPos = (position.x - 0.5f) * 2.f;

View File

@@ -67,10 +67,6 @@ namespace {
// when horizontal scrolling is required.
constexpr const int NVisibleCharsAfterCursor = 5;
constexpr std::array<const char*, 4> UniformNames = {
"res", "color", "height", "ortho"
};
constexpr openspace::properties::Property::PropertyInfo VisibleInfo = {
"IsVisible",
"Is Visible",