From a8d70aea35ab2bace7878f13dee50fd138ce109e Mon Sep 17 00:00:00 2001
From: Jeongseok Lee <jslee02@gmail.com>
Date: Sat, 25 Apr 2015 01:31:32 -0400
Subject: [PATCH] Place FCL_DEPRECATED in front of function/variable/class for
portability
---
include/fcl/collision_object.h | 6 ++++--
include/fcl/deprecated.h | 7 +++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/fcl/collision_object.h b/include/fcl/collision_object.h
index 33b0aec8..272d6c38 100644
--- a/include/fcl/collision_object.h
+++ b/include/fcl/collision_object.h
@@ -297,7 +297,8 @@ public:
}
/// @brief get geometry from the object instance
- const CollisionGeometry* getCollisionGeometry() const FCL_DEPRECATED
+ FCL_DEPRECATED
+ const CollisionGeometry* getCollisionGeometry() const
{
return cgeom.get();
}
@@ -446,7 +447,8 @@ public:
}
/// @brief get geometry from the object instance
- inline const CollisionGeometry* getCollisionGeometry() const FCL_DEPRECATED
+ FCL_DEPRECATED
+ inline const CollisionGeometry* getCollisionGeometry() const
{
return cgeom.get();
}
diff --git a/include/fcl/deprecated.h b/include/fcl/deprecated.h
index 16c74e83..e7646ad7 100644
--- a/include/fcl/deprecated.h
+++ b/include/fcl/deprecated.h
@@ -41,14 +41,13 @@
// variable as deprecated (i.e. it will emit a warning when using it).
//
// Tagging a function as deprecated:
-// void foo () FCL_DEPRECATED;
+// FCL_DEPRECATED void foo ();
//
// Tagging a type as deprecated:
-// class Foo {};
-// typedef Foo Bar FCL_DEPRECATED;
+// FCL_DEPRECATED class Foo {};
//
// 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
// feature of C++ language or preprocessor, even if most of the
--
GitLab