Commit 5823a5f7 authored by stonneau's avatar stonneau
Browse files

removed useless export

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