Skip to content
Snippets Groups Projects
Commit 5823a5f7 authored by stonneau's avatar stonneau
Browse files

removed useless export

parent e9fdd644
No related branches found
No related tags found
No related merge requests found
......@@ -12,7 +12,6 @@
#include "Curve_ABC.h"
#include "Exports.h"
#include "MathDefs.h"
#include <vector>
......@@ -36,7 +35,7 @@ struct bezier_curve : public curve_abc<Time, Numeric, Dim, Safe, Point>
///\param PointsBegin, PointsEnd : the points parametering the Bezier curve
///\TODO : so far size above 3 is ignored
template<typename In>
SPLINE_API bezier_curve(In PointsBegin, In PointsEnd, const time_t minBound=0, const time_t maxBound=1)
bezier_curve(In PointsBegin, In PointsEnd, const time_t minBound=0, const time_t maxBound=1)
: minBound_(minBound)
, maxBound_(maxBound)
, size_(std::distance(PointsBegin, PointsEnd))
......@@ -53,7 +52,7 @@ struct bezier_curve : public curve_abc<Time, Numeric, Dim, Safe, Point>
}
///\brief Destructor
SPLINE_API ~bezier_curve()
~bezier_curve()
{
// NOTHING
}
......@@ -69,7 +68,7 @@ struct bezier_curve : public curve_abc<Time, Numeric, Dim, Safe, Point>
/// \brief Evaluation of the cubic spline at time t.
/// \param t : the time when to evaluate the spine
/// \param return : the value x(t)
SPLINE_API virtual point_t operator()(time_t t) const
virtual point_t operator()(time_t t) const
{
num_t nT = (t - minBound_) / (maxBound_ - minBound_);
if(Safe &! (0 <= nT && nT <= 1))
......@@ -101,8 +100,8 @@ struct bezier_curve : public curve_abc<Time, Numeric, Dim, Safe, Point>
/*Operations*/
/*Helpers*/
SPLINE_API virtual time_t MinBound() const{return minBound_;}
SPLINE_API virtual time_t MaxBound() const{return minBound_;}
virtual time_t MinBound() const{return minBound_;}
virtual time_t MaxBound() const{return minBound_;}
/*Helpers*/
public:
......
......@@ -14,7 +14,6 @@
#ifndef _STRUCT_CUBICFUNCTION
#define _STRUCT_CUBICFUNCTION
#include "Exports.h"
#include "MathDefs.h"
#include "Curve_ABC.h"
......@@ -38,7 +37,7 @@ namespace spline
/* Constructors - destructors */
public:
///\brief Constructor
SPLINE_API cubic_function(point_t const& a, point_t const& b, point_t const& c, point_t const &d, time_t min, time_t max)
cubic_function(point_t const& a, point_t const& b, point_t const& c, point_t const &d, time_t min, time_t max)
:a_(a), b_(b), c_(c), d_(d), t_min_(min), t_max_(max)
{
if(t_min_ >= t_max_ & Safe)
......@@ -48,7 +47,7 @@ namespace spline
}
///\brief Destructor
SPLINE_API ~cubic_function()
~cubic_function()
{
// NOTHING
}
......@@ -63,7 +62,7 @@ namespace spline
/// \brief Evaluation of the cubic spline at time t.
/// \param t : the time when to evaluate the spine
/// \param return : the value x(t)
SPLINE_API virtual point_t operator()(time_t t) const
virtual point_t operator()(time_t t) const
{
if((t < t_min_ || t > t_max_) && Safe){ throw std::out_of_range("TODO");}
time_t const dt (t-t_min_);
......@@ -73,8 +72,8 @@ namespace spline
/*Helpers*/
public:
SPLINE_API num_t virtual MinBound() const {return t_min_;}
SPLINE_API num_t virtual MaxBound() const {return t_max_;}
num_t virtual MinBound() const {return t_min_;}
num_t virtual MaxBound() const {return t_max_;}
/*Helpers*/
/*Attributes*/
......
......@@ -12,7 +12,6 @@
#ifndef _STRUCT_CURVE_ABC
#define _STRUCT_CURVE_ABC
#include "Exports.h"
#include "MathDefs.h"
#include <functional>
......@@ -32,10 +31,10 @@ struct curve_abc : std::unary_function<Time, Point>
/* Constructors - destructors */
public:
///\brief Constructor
SPLINE_API curve_abc(){};
curve_abc(){};
///\brief Destructor
SPLINE_API ~curve_abc(){};
~curve_abc(){};
/* Constructors - destructors */
/*Operations*/
......@@ -43,12 +42,12 @@ struct curve_abc : std::unary_function<Time, Point>
/// \brief Evaluation of the cubic spline at time t.
/// \param t : the time when to evaluate the spine
/// \param return : the value x(t)
SPLINE_API virtual point_t operator()(time_t t) const = 0;
virtual point_t operator()(time_t t) const = 0;
/*Operations*/
/*Helpers*/
SPLINE_API virtual time_t MinBound() const = 0;
SPLINE_API virtual time_t MaxBound() const = 0;
virtual time_t MinBound() const = 0;
virtual time_t MaxBound() const = 0;
/*Helpers*/
};
......
......@@ -23,7 +23,6 @@
#include "Curve_ABC.h"
#include "CubicFunction.h"
#include "Exports.h"
#include "MathDefs.h"
#include <functional>
......@@ -57,7 +56,7 @@ struct exact_cubic : public curve_abc<Time, Numeric, Dim, Safe, Point>
///\param wayPointsBegin : an iterator pointing to the first element of a waypoint container
///\param wayPointsEns : an iterator pointing to the end of a waypoint container
template<typename In>
SPLINE_API exact_cubic(In wayPointsBegin, In wayPointsEnd)
exact_cubic(In wayPointsBegin, In wayPointsEnd)
{
std::size_t const size(std::distance(wayPointsBegin, wayPointsEnd));
if(Safe && size < 1)
......@@ -129,7 +128,7 @@ struct exact_cubic : public curve_abc<Time, Numeric, Dim, Safe, Point>
}
///\brief Destructor
SPLINE_API ~exact_cubic()
~exact_cubic()
{
for(IT_cubic it = subSplines_.begin(); it != subSplines_.end(); ++ it)
{
......@@ -147,7 +146,7 @@ struct exact_cubic : public curve_abc<Time, Numeric, Dim, Safe, Point>
/// \brief Evaluation of the cubic spline at time t.
/// \param t : the time when to evaluate the spine
/// \param return : the value x(t)
SPLINE_API virtual point_t operator()(time_t t) const
virtual point_t operator()(time_t t) const
{
if(Safe && (t < subSplines_.front()->t_min_ || t > subSplines_.back()->t_max_)){throw std::out_of_range("TODO");}
......@@ -163,8 +162,8 @@ struct exact_cubic : public curve_abc<Time, Numeric, Dim, Safe, Point>
/*Helpers*/
public:
SPLINE_API num_t virtual MinBound() const{return subSplines_.front()->t_min_;}
SPLINE_API num_t virtual MaxBound() const{return subSplines_.back()->t_max_;}
num_t virtual MinBound() const{return subSplines_.front()->t_min_;}
num_t virtual MaxBound() const{return subSplines_.back()->t_max_;}
/*Helpers*/
/*Attributes*/
......
/**
* \file Exports.h
* \brief Exports definition for the spline dll (windows)
* \author Steve T.
* \version 0.1
* \date 06/17/2013
*/
#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
#ifdef SPLINE_DLLEXPORT
#define SPLINE_API __declspec(dllexport)
#else
#define SPLINE_API __declspec(dllimport)
#endif
#else
#define SPLINE_API
#endif
......@@ -15,8 +15,6 @@
#ifndef _SPLINEMATH
#define _SPLINEMATH
#include "Exports.h"
#include <Eigen/Dense>
#include <Eigen/SVD>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment