Skip to content
Snippets Groups Projects
Commit 6362f643 authored by Jeongseok Lee's avatar Jeongseok Lee
Browse files

Merge pull request #65 from dartsim/place_of_deprecated_mark

Place of FCL_DEPRECATED for portability
parents 25ea9cb0 a8d70aea
No related branches found
No related tags found
No related merge requests found
...@@ -298,7 +298,8 @@ public: ...@@ -298,7 +298,8 @@ public:
} }
/// @brief get geometry from the object instance /// @brief get geometry from the object instance
const CollisionGeometry* getCollisionGeometry() const FCL_DEPRECATED FCL_DEPRECATED
const CollisionGeometry* getCollisionGeometry() const
{ {
return cgeom.get(); return cgeom.get();
} }
...@@ -447,7 +448,8 @@ public: ...@@ -447,7 +448,8 @@ public:
} }
/// @brief get geometry from the object instance /// @brief get geometry from the object instance
inline const CollisionGeometry* getCollisionGeometry() const FCL_DEPRECATED FCL_DEPRECATED
inline const CollisionGeometry* getCollisionGeometry() const
{ {
return cgeom.get(); return cgeom.get();
} }
......
...@@ -41,14 +41,13 @@ ...@@ -41,14 +41,13 @@
// variable as deprecated (i.e. it will emit a warning when using it). // variable as deprecated (i.e. it will emit a warning when using it).
// //
// Tagging a function as deprecated: // Tagging a function as deprecated:
// void foo () FCL_DEPRECATED; // FCL_DEPRECATED void foo ();
// //
// Tagging a type as deprecated: // Tagging a type as deprecated:
// class Foo {}; // FCL_DEPRECATED class Foo {};
// typedef Foo Bar FCL_DEPRECATED;
// //
// Tagging a variable as deprecated: // Tagging a variable as deprecated:
// int a FCL_DEPRECATED = 0; // FCL_DEPRECATED int a = 0;
// //
// The use of a macro is required as this is /not/ a standardized // The use of a macro is required as this is /not/ a standardized
// feature of C++ language or preprocessor, even if most of the // feature of C++ language or preprocessor, even if most of the
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment