Fix MSVC link errors (missing DLLEXPORTs)
parent
ecd65b1ad9
commit
fb05fa6bd7
|
|
@ -115,8 +115,8 @@ class DSFMap {
|
||||||
/// Small utility class for representing a wrappable pairs of ints.
|
/// Small utility class for representing a wrappable pairs of ints.
|
||||||
class IndexPair : public std::pair<size_t,size_t> {
|
class IndexPair : public std::pair<size_t,size_t> {
|
||||||
public:
|
public:
|
||||||
IndexPair(): std::pair<size_t,size_t>(0,0) {}
|
inline IndexPair(): std::pair<size_t,size_t>(0,0) {}
|
||||||
IndexPair(size_t i, size_t j) : std::pair<size_t,size_t>(i,j) {}
|
inline IndexPair(size_t i, size_t j) : std::pair<size_t,size_t>(i,j) {}
|
||||||
inline size_t i() const { return first; };
|
inline size_t i() const { return first; };
|
||||||
inline size_t j() const { return second; };
|
inline size_t j() const { return second; };
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
#include <gtsam/config.h> // for GTSAM_USE_TBB
|
#include <gtsam/config.h> // for GTSAM_USE_TBB
|
||||||
|
|
||||||
#include <boost/optional/optional.hpp>
|
#include <boost/optional/optional.hpp>
|
||||||
|
#include <gtsam/dllexport.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
|
|
||||||
|
|
@ -117,7 +118,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Thread-safe runtime error exception
|
/// Thread-safe runtime error exception
|
||||||
class RuntimeErrorThreadsafe: public ThreadsafeException<RuntimeErrorThreadsafe> {
|
class GTSAM_EXPORT RuntimeErrorThreadsafe: public ThreadsafeException<RuntimeErrorThreadsafe> {
|
||||||
public:
|
public:
|
||||||
/// Construct with a string describing the exception
|
/// Construct with a string describing the exception
|
||||||
RuntimeErrorThreadsafe(const std::string& description) :
|
RuntimeErrorThreadsafe(const std::string& description) :
|
||||||
|
|
|
||||||
|
|
@ -196,7 +196,7 @@ namespace gtsam {
|
||||||
/**
|
/**
|
||||||
* Small class that calls internal::tic at construction, and internol::toc when destroyed
|
* Small class that calls internal::tic at construction, and internol::toc when destroyed
|
||||||
*/
|
*/
|
||||||
class AutoTicToc {
|
class GTSAM_EXPORT AutoTicToc {
|
||||||
private:
|
private:
|
||||||
size_t id_;
|
size_t id_;
|
||||||
const char* label_;
|
const char* label_;
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ namespace gtsam {
|
||||||
/** The common parameters for Nonlinear optimizers. Most optimizers
|
/** The common parameters for Nonlinear optimizers. Most optimizers
|
||||||
* deriving from NonlinearOptimizer also subclass the parameters.
|
* deriving from NonlinearOptimizer also subclass the parameters.
|
||||||
*/
|
*/
|
||||||
class NonlinearOptimizerParams {
|
class GTSAM_EXPORT NonlinearOptimizerParams {
|
||||||
public:
|
public:
|
||||||
/** See NonlinearOptimizerParams::verbosity */
|
/** See NonlinearOptimizerParams::verbosity */
|
||||||
enum Verbosity {
|
enum Verbosity {
|
||||||
|
|
@ -52,7 +52,7 @@ public:
|
||||||
|
|
||||||
virtual ~NonlinearOptimizerParams() {
|
virtual ~NonlinearOptimizerParams() {
|
||||||
}
|
}
|
||||||
GTSAM_EXPORT virtual void print(const std::string& str = "") const;
|
virtual void print(const std::string& str = "") const;
|
||||||
|
|
||||||
size_t getMaxIterations() const { return maxIterations; }
|
size_t getMaxIterations() const { return maxIterations; }
|
||||||
double getRelativeErrorTol() const { return relativeErrorTol; }
|
double getRelativeErrorTol() const { return relativeErrorTol; }
|
||||||
|
|
@ -68,8 +68,8 @@ public:
|
||||||
verbosity = verbosityTranslator(src);
|
verbosity = verbosityTranslator(src);
|
||||||
}
|
}
|
||||||
|
|
||||||
GTSAM_EXPORT static Verbosity verbosityTranslator(const std::string &s) ;
|
static Verbosity verbosityTranslator(const std::string &s) ;
|
||||||
GTSAM_EXPORT static std::string verbosityTranslator(Verbosity value) ;
|
static std::string verbosityTranslator(Verbosity value) ;
|
||||||
|
|
||||||
/** See NonlinearOptimizerParams::linearSolverType */
|
/** See NonlinearOptimizerParams::linearSolverType */
|
||||||
enum LinearSolverType {
|
enum LinearSolverType {
|
||||||
|
|
@ -144,10 +144,10 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
GTSAM_EXPORT std::string linearSolverTranslator(LinearSolverType linearSolverType) const;
|
std::string linearSolverTranslator(LinearSolverType linearSolverType) const;
|
||||||
GTSAM_EXPORT LinearSolverType linearSolverTranslator(const std::string& linearSolverType) const;
|
LinearSolverType linearSolverTranslator(const std::string& linearSolverType) const;
|
||||||
GTSAM_EXPORT std::string orderingTypeTranslator(Ordering::OrderingType type) const;
|
std::string orderingTypeTranslator(Ordering::OrderingType type) const;
|
||||||
GTSAM_EXPORT Ordering::OrderingType orderingTypeTranslator(const std::string& type) const;
|
Ordering::OrderingType orderingTypeTranslator(const std::string& type) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
// For backward compatibility:
|
// For backward compatibility:
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ namespace gtsam {
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
/// A clique in a SymbolicBayesTree
|
/// A clique in a SymbolicBayesTree
|
||||||
class SymbolicBayesTreeClique :
|
class GTSAM_EXPORT SymbolicBayesTreeClique :
|
||||||
public BayesTreeCliqueBase<SymbolicBayesTreeClique, SymbolicFactorGraph>
|
public BayesTreeCliqueBase<SymbolicBayesTreeClique, SymbolicFactorGraph>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
@ -45,7 +45,7 @@ namespace gtsam {
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
/// A Bayes tree that represents the connectivity between variables but is not associated with any
|
/// A Bayes tree that represents the connectivity between variables but is not associated with any
|
||||||
/// probability functions.
|
/// probability functions.
|
||||||
class SymbolicBayesTree :
|
class GTSAM_EXPORT SymbolicBayesTree :
|
||||||
public BayesTree<SymbolicBayesTreeClique>
|
public BayesTree<SymbolicBayesTreeClique>
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
|
@ -59,7 +59,7 @@ namespace gtsam {
|
||||||
SymbolicBayesTree() {}
|
SymbolicBayesTree() {}
|
||||||
|
|
||||||
/** check equality */
|
/** check equality */
|
||||||
GTSAM_EXPORT bool equals(const This& other, double tol = 1e-9) const;
|
bool equals(const This& other, double tol = 1e-9) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue