mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-03-10 07:18:46 -05:00
Fix ifndefs in headers
This commit is contained in:
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
|
||||
#define __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
|
||||
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
|
||||
#define __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
|
||||
|
||||
#include <modules/autonavigation/path.h>
|
||||
#include <openspace/properties/list/stringlistproperty.h>
|
||||
@@ -92,4 +92,4 @@ private:
|
||||
|
||||
} // namespace openspace::autonavigation
|
||||
|
||||
#endif // __OPENSPACE_MODULE___AUTONAVIGATIONHANDLER___H__
|
||||
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___AUTONAVIGATIONHANDLER___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_MODULE___EASINGFUNCTIONS___H__
|
||||
#define __OPENSPACE_MODULE___EASINGFUNCTIONS___H__
|
||||
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
|
||||
#define __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
|
||||
|
||||
#include <ghoul/glm.h>
|
||||
#include <ghoul/logging/logmanager.h>
|
||||
@@ -51,7 +51,7 @@ namespace openspace::autonavigation::helpers {
|
||||
|
||||
double fivePointGaussianQuadrature(double t0, double t1,
|
||||
std::function<double(double)> f);
|
||||
} // namespace
|
||||
} // namespace openspace::autonavigation::helpers
|
||||
|
||||
namespace openspace::autonavigation::interpolation {
|
||||
|
||||
@@ -79,5 +79,5 @@ namespace openspace::autonavigation::interpolation {
|
||||
glm::dvec3 piecewiseLinear(double t, const std::vector<glm::dvec3>& points,
|
||||
const std::vector<double>& tKnots);
|
||||
|
||||
} // namespace
|
||||
#endif
|
||||
} // namespace openspace::autonavigation::interpolation
|
||||
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___HELPERFUNCTIONS___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_MODULE___PATHSEGMENT___H__
|
||||
#define __OPENSPACE_MODULE___PATHSEGMENT___H__
|
||||
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
|
||||
#define __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
|
||||
|
||||
#include <modules/autonavigation/pathcurve.h>
|
||||
#include <modules/autonavigation/speedfunction.h>
|
||||
@@ -76,4 +76,4 @@ private:
|
||||
|
||||
} // namespace openspace::autonavigation
|
||||
|
||||
#endif // __OPENSPACE_MODULE___PATHSEGMENT___H__
|
||||
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___PATH___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_MODULE___PATHINSTRUCTION___H__
|
||||
#define __OPENSPACE_MODULE___PATHINSTRUCTION___H__
|
||||
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
|
||||
#define __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
|
||||
|
||||
#include <modules/autonavigation/waypoint.h>
|
||||
#include <optional>
|
||||
@@ -59,4 +59,4 @@ private:
|
||||
|
||||
} // namespace openspace::autonavigation
|
||||
|
||||
#endif // __OPENSPACE_MODULE___PATHINSTRUCTION___H__
|
||||
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___PATHINSTRUCTION___H__
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
||||
****************************************************************************************/
|
||||
|
||||
#ifndef __OPENSPACE_MODULE___WAYPOINT___H__
|
||||
#define __OPENSPACE_MODULE___WAYPOINT___H__
|
||||
#ifndef __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__
|
||||
#define __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__
|
||||
|
||||
#include <openspace/interaction/navigationhandler.h>
|
||||
#include <ghoul/glm.h>
|
||||
@@ -57,4 +57,4 @@ struct Waypoint {
|
||||
|
||||
} // namespace openspace::autonavigation
|
||||
|
||||
#endif // __OPENSPACE_MODULE___WAYPOINT___H__
|
||||
#endif // __OPENSPACE_MODULE_AUTONAVIGATION___WAYPOINT___H__
|
||||
|
||||
Reference in New Issue
Block a user