Merge remote-tracking branch 'origin/release-6.1'

dartsim · Jul 19, 2016 · ed7ec81 · ed7ec81
2 parents 03d3cbd + 19bd560
commit ed7ec81
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dart/dynamics/Shape.hpp b/dart/dynamics/Shape.hpp
@@ -101,7 +101,7 @@ class Shape : public virtual common::Subject
   int getID() const;
 
   /// \deprecated Deprecated in 6.1. Please use getType() instead.
-  DEPRECATED(6.1)
+  DART_DEPRECATED(6.1)
   ShapeType getShapeType() const;
 
   /// Set the data variance of this shape. Use the DataVariance to indicate what