Merge remote branch 'origin/master'

NEWS

+New in version 2.5.1 - 2011-12-07
+      Make destructor of TimeDependency virtual.
+      Do not hardcode dl, use ${CMAKE_DL_LIBS}.
+      Win32: Correct the importation/exportation of symbols
+      Win32: Correct a wrong macro
+      Add missing header inclusion
+      Disable a test for mac.
+      For compatibility, added a static function to bind the singleton.
+New in version 2.5 - 2011-06-21
 New in version 1.1 - 2010-09-30
       Configured dynamicGraph package and cmake files. Last-minute adjustment to code for SOT separation (SOT Break)
       Added forgotten files.

include/dynamic-graph/command.h

@@ -40,7 +40,7 @@ namespace dynamicgraph {
     /// Parameters are set by calling Command::setParameterValues with a
     /// vector of Values the types of which should fit the vector specified
     /// at construction.
-    class DYNAMIC_GRAPH_DLLEXPORT Command
+    class DYNAMIC_GRAPH_DLLAPI Command
     {
     public:
       virtual ~Command();

include/dynamic-graph/time-dependency.h

@@ -65,7 +65,7 @@ namespace dynamicgraph
     TimeDependency( SignalBase<Time>* sig,
 		    const SignalArray_const<Time>& arr,
 		    const DependencyType dep = DEPENDENCY_TYPE_DEFAULT );
-    ~TimeDependency  () {}
+    virtual ~TimeDependency  () {}
 
     void addDependency( const SignalBase<Time>& sig );
     void removeDependency( const SignalBase<Time>& sig );

include/dynamic-graph/value.h

@@ -28,7 +28,7 @@
 namespace dynamicgraph {
   namespace command {
     class Value;
-    class EitherType {
+    class DYNAMIC_GRAPH_DLLEXPORT EitherType {
     public:
       EitherType(const Value& value);
       ~EitherType();
@@ -92,9 +92,9 @@ namespace dynamicgraph {
       static std::string typeName(Type type);
 
       /// Output in a stream
-      friend std::ostream& operator<<(std::ostream& os, const Value& value);
+      DYNAMIC_GRAPH_DLLEXPORT friend std::ostream& operator<<(std::ostream& os, const Value& value);
     public:
-      friend class EitherType;
+      DYNAMIC_GRAPH_DLLEXPORT friend class EitherType;
       bool boolValue() const;
       unsigned unsignedValue() const;
       int intValue() const;

src/CMakeLists.txt

@@ -53,7 +53,7 @@ SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
 PKG_CONFIG_USE_DEPENDENCY(${LIBRARY_NAME} jrl-mal)
 
 IF (UNIX)
-  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} dl pthread)
+  TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${CMAKE_DL_LIBS} pthread)
 ENDIF (UNIX)
 
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})

src/traces/tracer.cpp

@@ -25,6 +25,7 @@
 /* DG */
 #include <dynamic-graph/tracer.h>
 #include <dynamic-graph/debug.h>
+#include <dynamic-graph/value.h>
 #include <dynamic-graph/pool.h>
 #include <dynamic-graph/factory.h>
 #include <dynamic-graph/all-commands.h>
@@ -32,6 +33,7 @@
 
 using namespace std;
 using namespace dynamicgraph;
+using namespace dynamicgraph::command;
 
 DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(Tracer,"Tracer");
 

tests/CMakeLists.txt

@@ -60,7 +60,9 @@ ENDFOREACH()
 DYNAMIC_GRAPH_TEST(signal-cast-registerer)
 
 # Unit testing.
-DYNAMIC_GRAPH_TEST(entity)
+IF(NOT APPLE)
+  DYNAMIC_GRAPH_TEST(entity)
+ENDIF(NOT APPLE)
 DYNAMIC_GRAPH_TEST(custom-entity)
 DYNAMIC_GRAPH_TEST(factory)
 DYNAMIC_GRAPH_TEST(pool)