Remove warnings

Update Ghoul repository
Fix spelling mistake in openspace.cfg
This commit is contained in:
Alexander Bock
2017-06-08 00:07:51 -04:00
parent 1e0240b47a
commit 9a7eba16bd
24 changed files with 66 additions and 58 deletions
@@ -66,7 +66,7 @@ struct CameraKeyframe {
// Follow focus node rotation?
buffer.insert(buffer.end(), reinterpret_cast<char*>(&_followNodeRotation), reinterpret_cast<char*>(&_followNodeRotation) + sizeof(_followNodeRotation));
int nodeNameLength = _focusNode.size();
int nodeNameLength = static_cast<int>(_focusNode.size());
// Add focus node
buffer.insert(buffer.end(), reinterpret_cast<char*>(&nodeNameLength), reinterpret_cast<char*>(&nodeNameLength) + sizeof(nodeNameLength));
+1 -1
View File
@@ -91,6 +91,6 @@ bool compareKeyframeTimeWithTime(const KeyframeBase& a, double b);
} // namespace openspace
#include <openspace/util/timeline.inl>;
#include <openspace/util/timeline.inl>
#endif // __OPENSPACE_CORE___TIMELINE___H__