Permalink
Browse files

Add missing symbol exportations

  • Loading branch information...
1 parent 92decef commit 7ac0832d860e4dcdc09bfa6fbe189114eb91761f @francois-keith francois-keith committed with Francois Keith May 13, 2011
Showing with 40 additions and 32 deletions.
  1. +3 −2 src/ActiveSet.hpp
  2. +8 −8 src/Algebra.hpp
  3. +3 −2 src/Allocator.hpp
  4. +2 −1 src/BaseY.hpp
  5. +2 −1 src/BasicStage.hpp
  6. +6 −4 src/Bound.hpp
  7. +3 −5 src/CMakeLists.txt
  8. +5 −4 src/Givens.hpp
  9. +2 −1 src/HCOD.hpp
  10. +2 −1 src/Stage.hpp
  11. +4 −3 src/debug.hpp
View
@@ -1,6 +1,7 @@
#ifndef __SOTH_ASET__
#define __SOTH_ASET__
+#include "soth/api.hpp"
#include "soth/Algebra.hpp"
#include "soth/Bound.hpp"
#include <vector>
@@ -20,7 +21,7 @@ namespace soth
* is stored in WMLY will need to inverse the W.indirectRow map, which is not
* done in the class.
*/
- class ActiveSet
+ class SOTH_EXPORT ActiveSet
{
public: /* --- Construction --- */
ActiveSet( unsigned int nr );
@@ -88,7 +89,7 @@ namespace soth
public:
inline operator VectorXi (void) const { return getIndirection(); }
- friend std::ostream& operator<< ( std::ostream & os,const ActiveSet& as );
+ SOTH_EXPORT friend std::ostream& operator<< ( std::ostream & os,const ActiveSet& as );
};
View
@@ -3,7 +3,7 @@
#include <Eigen/Core>
#include <iostream>
-
+#include "soth/api.hpp"
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
@@ -29,9 +29,9 @@ namespace soth
struct MATLAB
{
- friend std::ostream & operator << (std::ostream & os, const MATLAB & m );
+ SOTH_EXPORT friend std::ostream & operator << (std::ostream & os, const MATLAB & m );
- MATLAB( const double& x );
+ SOTH_EXPORT MATLAB( const double& x );
template< typename Derived >
MATLAB( const MatrixBase<Derived> & m1 ) { genericInit(m1); }
template< typename Derived >
@@ -46,13 +46,13 @@ namespace soth
void initMatrix( const MatrixBase<Derived> & m1 );
template< typename VectorGen >
void initVector( const VectorGen & v );
- inline void initMatrixNull( void );
- inline void initMatrixColNull( unsigned int size );
- inline void initMatrixRowNull( unsigned int size );
+ SOTH_EXPORT inline void initMatrixNull( void );
+ SOTH_EXPORT inline void initMatrixColNull( unsigned int size );
+ SOTH_EXPORT inline void initMatrixRowNull( unsigned int size );
- static bool fullPrec;
- static unsigned int precision;
+ SOTH_EXPORT static bool fullPrec;
+ SOTH_EXPORT static unsigned int precision;
std::string str;
};
View
@@ -4,10 +4,11 @@
#include <list>
#include <iostream>
+#include <soth/api.hpp>
namespace soth
{
- class AllocatorML
+ class SOTH_EXPORT AllocatorML
{
typedef std::list<unsigned int> resource_t;
typedef resource_t::iterator resource_iter_t;
@@ -24,7 +25,7 @@ namespace soth
void put( const unsigned int & token );
void disp( std::ostream & os ) const;
- friend std::ostream& operator<<( std::ostream & os, const AllocatorML & aml );
+ SOTH_EXPORT friend std::ostream& operator<<( std::ostream & os, const AllocatorML & aml );
};
} // namespace soth
View
@@ -2,14 +2,15 @@
#define __SOTH_BASEY__
+#include "soth/api.hpp"
#include "soth/Algebra.hpp"
#include <Eigen/Householder>
#include "soth/Givens.hpp"
namespace soth
{
- class BaseY
+ class SOTH_EXPORT BaseY
{
protected:
typedef MatrixXd::Index Index;
View
@@ -4,6 +4,7 @@
#include <Eigen/Core>
#include <list>
#include <string>
+#include "soth/api.hpp"
#include "soth/Bound.hpp"
#include "soth/Algebra.hpp"
@@ -17,7 +18,7 @@ namespace soth
class BaseY;
/* --- STAGE -------------------------------------------------------------- */
- class BasicStage : boost::noncopyable
+ class SOTH_EXPORT BasicStage : boost::noncopyable
{
private:
VectorBound boundsInternal;
View
@@ -5,9 +5,11 @@
#include <iostream>
#include <vector>
+#include <soth/api.hpp>
+
namespace soth
{
- class Bound
+ class SOTH_EXPORT Bound
{
public:
enum bound_t
@@ -49,7 +51,7 @@ namespace soth
Bound& operator= ( const Bound& clone );
Bound& operator= ( const double & val);
Bound& operator= ( const std::pair<double,double> & val);
- friend std::ostream& operator<< (std::ostream& os, const Bound& );
+ SOTH_EXPORT friend std::ostream& operator<< (std::ostream& os, const Bound& );
}; // Class Bound
@@ -66,8 +68,8 @@ namespace soth
extern const ConstraintRef CONSTRAINT_VOID;
typedef std::vector<ConstraintRef> cstref_vector_t;
- std::ostream& operator<< (std::ostream& os, const VectorBound& t);
- std::ostream& operator<<( std::ostream&os,const ConstraintRef& cst );
+ SOTH_EXPORT std::ostream& operator<< (std::ostream& os, const VectorBound& t);
+ SOTH_EXPORT std::ostream& operator<<( std::ostream&os,const ConstraintRef& cst );
} // namespace soth
View
@@ -5,7 +5,6 @@
#
SET(LIBRARY_NAME ${PROJECT_NAME})
-ADD_DEFINITIONS("-DEIGEN2_SUPPORT")
IF(WIN32)
ADD_DEFINITIONS("-DNOMINMAX")
ENDIF(WIN32)
@@ -44,10 +43,6 @@ SET(${PROJECT_NAME}_HEADERS
SubMatrix.hpp
)
-IF(WIN32)
- LIST(REMOVE_ITEM ${PROJECT_NAME}_SRC HCOD.cpp Stage.cpp)
-ENDIF(WIN32)
-
# ----------------------------------------------------
# --- INCLUDE ----------------------------------------
# ----------------------------------------------------
@@ -79,7 +74,10 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include)
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
${${PROJECT_NAME}_SRC})
+
+IF(NOT WIN32)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_SIGNALS_LIBRARY})
+ENDIF(NOT WIN32)
SET_TARGET_PROPERTIES(${LIBRARY_NAME}
PROPERTIES
View
@@ -3,6 +3,7 @@
#include <Eigen/Core>
#include <Eigen/Jacobi>
+#include <soth/api.hpp>
#include <soth/SubMatrix.hpp>
#include <soth/Algebra.hpp>
#include <vector>
@@ -23,16 +24,16 @@ namespace soth
typedef JacobiRotation<double> NestedType;
public:
- Givens();
- Givens(double a, double b, int i, int j, double* z=0);
+ SOTH_EXPORT Givens();
+ SOTH_EXPORT Givens(double a, double b, int i, int j, double* z=0);
template<typename VectorBase>
Givens(const VectorBase & v, int i, int j);
template<typename VectorBase>
Givens(VectorBase & v, int i, int j, bool apply = false);
public:
- void makeGivens(double a, double b, int i, int j, double* z=0);
+ SOTH_EXPORT void makeGivens(double a, double b, int i, int j, double* z=0);
/* Givens to the right, ie such that G'*v (:= G.applyTransposeOnTheRight(v) )
* is nullified. */
@@ -167,7 +168,7 @@ namespace soth
class GivensSequence
{
public:
- GivensSequence& push(const Givens& g);
+ SOTH_EXPORT GivensSequence& push(const Givens& g);
void clear() { G.clear(); }
void reserve( unsigned int ncsquare ) { G.reserve(ncsquare); }
View
@@ -1,6 +1,7 @@
#ifndef __SOTH_HCOD__
#define __SOTH_HCOD__
+#include "soth/api.hpp"
#include "soth/Stage.hpp"
#include "soth/BaseY.hpp"
#include <boost/smart_ptr.hpp>
@@ -9,7 +10,7 @@ namespace soth
{
- class HCOD
+ class SOTH_EXPORT HCOD
{
protected:
typedef boost::shared_ptr<soth::Stage> stage_ptr_t;
View
@@ -5,6 +5,7 @@
#include <list>
#include <string>
+#include "soth/api.hpp"
#include "soth/BasicStage.hpp"
#include "soth/SubMatrix.hpp"
#include "soth/solvers.hpp"
@@ -23,7 +24,7 @@ namespace soth
/* --- STAGE -------------------------------------------------------------- */
/* --- STAGE -------------------------------------------------------------- */
- class Stage
+ class SOTH_EXPORT Stage
:public BasicStage
{
public:
View
@@ -42,6 +42,7 @@
#include <fstream>
#include <sstream>
#include <stdarg.h>
+#include "soth/api.hpp"
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
@@ -68,7 +69,7 @@ namespace soth
outputbuffer << tmpbuffer.str() << charbuffer <<std::endl; \
} while(0)
-class sotDebugTrace
+class SOTH_EXPORT sotDebugTrace
{
public:
static const int SIZE = 512;
@@ -109,8 +110,8 @@ class sotDebugTrace
};
-extern sotDebugTrace sotDEBUGFLOW;
-extern sotDebugTrace sotERRORFLOW;
+SOTH_EXPORT extern sotDebugTrace sotDEBUGFLOW;
+SOTH_EXPORT extern sotDebugTrace sotERRORFLOW;
#ifdef SOTH_DEBUG
#define sotPREDEBUG "% " << __FILE__ << ": " <<__FUNCTION__ \

0 comments on commit 7ac0832

Please sign in to comment.