mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-22 20:38:56 -05:00
Remove a bunch of compiler warnings
* Remove compile warnings * Coding style fix
This commit is contained in:
@@ -102,7 +102,7 @@ public:
|
||||
/**
|
||||
* Returns the associated link of this MissionPhase. If no link is associated, this
|
||||
* string will be empty.
|
||||
*
|
||||
*
|
||||
* \return The associated link of the MissionPhase or the empty string
|
||||
*/
|
||||
const std::string& link() const;
|
||||
@@ -179,7 +179,7 @@ protected:
|
||||
std::string _link;
|
||||
/// Actions associated with the phase
|
||||
std::vector<std::string> _actions;
|
||||
/// Important dates
|
||||
/// Important dates
|
||||
std::vector<Milestone> _milestones;
|
||||
};
|
||||
|
||||
|
||||
@@ -116,9 +116,10 @@ public:
|
||||
GLuint gBufferColorTexture() const;
|
||||
|
||||
/**
|
||||
* Gives access to the position texture of the G-buffer. NOTE: This texture is used for
|
||||
* the majority of rendering the scene and might be already in use. Use CAUTION when
|
||||
* using this function. The size of the texture is the resolution of the viewport.
|
||||
* Gives access to the position texture of the G-buffer. NOTE: This texture is used
|
||||
* for the majority of rendering the scene and might be already in use. Use CAUTION
|
||||
* when using this function. The size of the texture is the resolution of the
|
||||
* viewport.
|
||||
*
|
||||
* \return identifier of the position texture of the G-buffer
|
||||
*/
|
||||
|
||||
@@ -67,8 +67,8 @@ template <typename T>
|
||||
std::string formatJson(T value);
|
||||
|
||||
/**
|
||||
* Sort a json object that is an array of objects with the structure
|
||||
* [ key = {}, key = {} ...]. Sorts it by the provided key
|
||||
* Sort a json object that is an array of objects with the structure
|
||||
* [ key = {}, key = {} ...]. Sorts it by the provided key
|
||||
*
|
||||
* \param json The json to sort
|
||||
* \param key The key the json should be sorted by
|
||||
|
||||
@@ -74,6 +74,8 @@ public:
|
||||
explicit Time(const std::string& time);
|
||||
Time(const Time& other) = default;
|
||||
|
||||
Time& operator=(const Time& other) = default;
|
||||
|
||||
/**
|
||||
* Initializes the Time singleton.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user