From e9189ce21c0fdca6b1b9c555bf2779c095527914 Mon Sep 17 00:00:00 2001
From: Pierre Gergondet <pierre.gergondet@gmail.com>
Date: Tue, 22 Jul 2014 17:53:26 +0900
Subject: [PATCH] Fix visibility issues
- Replace DYNAMIC_GRAPH_DLLEXPORT by DYNAMIC_GRAPH_DLLAPI
- Remove an unnecessary attribute
---
include/dynamic-graph/command-getter.h | 2 +-
include/dynamic-graph/command-setter.h | 2 +-
include/dynamic-graph/signal-cast-helper.h | 12 ++++++------
include/dynamic-graph/value.h | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/dynamic-graph/command-getter.h b/include/dynamic-graph/command-getter.h
index 73e845e..a76de22 100644
--- a/include/dynamic-graph/command-getter.h
+++ b/include/dynamic-graph/command-getter.h
@@ -53,7 +53,7 @@ namespace dynamicgraph {
/// \li prototype of E::getParameter should be exactly as specified in this
/// example.
template <class E, typename T>
- class DYNAMIC_GRAPH_DLLEXPORT Getter : public Command {
+ class DYNAMIC_GRAPH_DLLAPI Getter : public Command {
public:
/// Pointer to method that sets paramter of type T
typedef T (E::*GetterMethod) () const;
diff --git a/include/dynamic-graph/command-setter.h b/include/dynamic-graph/command-setter.h
index 588567e..ad198f6 100644
--- a/include/dynamic-graph/command-setter.h
+++ b/include/dynamic-graph/command-setter.h
@@ -53,7 +53,7 @@ namespace dynamicgraph {
/// \li prototype of E::setParameter should be exactly as specified in this
/// example.
template <class E, typename T>
- class DYNAMIC_GRAPH_DLLEXPORT Setter : public Command {
+ class DYNAMIC_GRAPH_DLLAPI Setter : public Command {
public:
/// Pointer to method that sets paramter of type T
typedef void (E::*SetterMethod) (const T&);
diff --git a/include/dynamic-graph/signal-cast-helper.h b/include/dynamic-graph/signal-cast-helper.h
index 8b46375..62e4ff6 100644
--- a/include/dynamic-graph/signal-cast-helper.h
+++ b/include/dynamic-graph/signal-cast-helper.h
@@ -48,16 +48,16 @@ namespace dynamicgraph
: SignalCastRegisterer (typeid(T), disp, cast, trace)
{}
- DYNAMIC_GRAPH_DLLEXPORT
+ DYNAMIC_GRAPH_DLLAPI
static boost::any cast (std::istringstream& iss);
- DYNAMIC_GRAPH_DLLEXPORT
+ DYNAMIC_GRAPH_DLLAPI
static void disp (const boost::any& object, std::ostream& os)
{
os << boost::any_cast<T> (object) << std::endl;
}
- DYNAMIC_GRAPH_DLLEXPORT
+ DYNAMIC_GRAPH_DLLAPI
static void trace (const boost::any& object, std::ostream& os)
{
disp(object,os);
@@ -156,15 +156,15 @@ public:
static void disp( TYPE const& t,std::ostream& os ) DISP \
static void trace( TYPE const& t,std::ostream& os ) TRACE \
public: \
- DYNAMIC_GRAPH_DLLEXPORT \
+ DYNAMIC_GRAPH_DLLAPI \
static boost::any cast_( std::istringstream& stringValue ) { \
return boost::any_cast<TYPE>(cast(stringValue)); \
} \
- DYNAMIC_GRAPH_DLLEXPORT \
+ DYNAMIC_GRAPH_DLLAPI \
static void disp_( const boost::any& t,std::ostream& os ) { \
disp(boost::any_cast<TYPE>(t), os); \
} \
- DYNAMIC_GRAPH_DLLEXPORT \
+ DYNAMIC_GRAPH_DLLAPI \
static void trace_( const boost::any& t,std::ostream& os ) { \
trace(boost::any_cast<TYPE>(t),os); \
} \
diff --git a/include/dynamic-graph/value.h b/include/dynamic-graph/value.h
index 471e780..d31a711 100644
--- a/include/dynamic-graph/value.h
+++ b/include/dynamic-graph/value.h
@@ -28,7 +28,7 @@
namespace dynamicgraph {
namespace command {
class Value;
- class DYNAMIC_GRAPH_DLLEXPORT EitherType {
+ class DYNAMIC_GRAPH_DLLAPI EitherType {
public:
EitherType(const Value& value);
~EitherType();
@@ -44,7 +44,7 @@ namespace dynamicgraph {
const Value* value_;
};
- class DYNAMIC_GRAPH_DLLEXPORT Value {
+ class DYNAMIC_GRAPH_DLLAPI Value {
public:
enum Type {
NONE,
@@ -93,9 +93,9 @@ namespace dynamicgraph {
static std::string typeName(Type type);
/// Output in a stream
- DYNAMIC_GRAPH_DLLEXPORT friend std::ostream& operator<<(std::ostream& os, const Value& value);
+ DYNAMIC_GRAPH_DLLAPI friend std::ostream& operator<<(std::ostream& os, const Value& value);
public:
- DYNAMIC_GRAPH_DLLEXPORT friend class EitherType;
+ friend class EitherType;
bool boolValue() const;
unsigned unsignedValue() const;
int intValue() const;
--
GitLab