New files merged from dev weren't using the new a_pure macro yet.

This commit is contained in:
King_DuckZ 2014-08-25 17:44:13 +02:00
parent 5a71b943b2
commit af4f16a6d6
2 changed files with 6 additions and 4 deletions

View file

@ -21,12 +21,13 @@
#define id3E40B29606D048569E18083DB682280F #define id3E40B29606D048569E18083DB682280F
#include "vector.hpp" #include "vector.hpp"
#include "compatibility.h"
#include <ciso646> #include <ciso646>
#include <algorithm> #include <algorithm>
namespace cloonel { namespace cloonel {
template <typename T, uint32_t S> template <typename T, uint32_t S>
bool IsPointOnSegment ( const Vector<T, S>& parPoint, const Vector<T, S>& parSegA, const Vector<T, S>& parSegB ) __attribute__((pure)); bool IsPointOnSegment ( const Vector<T, S>& parPoint, const Vector<T, S>& parSegA, const Vector<T, S>& parSegB ) a_pure;
} //namespace cloonel } //namespace cloonel
#include "geometry.inl" #include "geometry.inl"

View file

@ -20,6 +20,7 @@
#include "vector.hpp" #include "vector.hpp"
#include "line.hpp" #include "line.hpp"
#include "geometry.hpp" #include "geometry.hpp"
#include "compatibility.h"
#include <ciso646> #include <ciso646>
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
@ -29,13 +30,13 @@
namespace cloonel { namespace cloonel {
template <typename T> template <typename T>
int GetOrientation ( const Vector<T, 2>& parPointA, const Vector<T, 2>& parPointB, const Vector<T, 2>& parPointC ) __attribute__((pure)); int GetOrientation ( const Vector<T, 2>& parPointA, const Vector<T, 2>& parPointB, const Vector<T, 2>& parPointC ) a_pure;
template <typename T> template <typename T>
bool Intersection2D ( const Vector<T, 2>& parSegA1, const Vector<T, 2>& parSegA2, const Vector<T, 2>& parSegB1, const Vector<T, 2>& parSegB2 ) __attribute__((pure)); bool Intersection2D ( const Vector<T, 2>& parSegA1, const Vector<T, 2>& parSegA2, const Vector<T, 2>& parSegB1, const Vector<T, 2>& parSegB2 ) a_pure;
template <typename T> template <typename T>
std::pair<bool, Vector<T, 2>> Intersection ( const Line<T, 2>& parSegA, const Line<T, 2>& parSegB ) __attribute__((pure)); std::pair<bool, Vector<T, 2>> Intersection ( const Line<T, 2>& parSegA, const Line<T, 2>& parSegB ) a_pure;
} //namespace cloonel } //namespace cloonel
#include "geometry_2d.inl" #include "geometry_2d.inl"