Commit c9f854f9 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Remove deprecated.h and use the one generated by CMake.

parent 0627dfaf
......@@ -39,7 +39,7 @@
#ifndef FCL_COLLISION_OBJECT_BASE_H
#define FCL_COLLISION_OBJECT_BASE_H
#include <hpp/fcl/deprecated.h>
#include <hpp/fcl/deprecated.hh>
#include <hpp/fcl/BV/AABB.h>
#include <hpp/fcl/math/transform.h>
#include <boost/shared_ptr.hpp>
......@@ -299,7 +299,7 @@ public:
}
/// @brief get geometry from the object instance
FCL_DEPRECATED
HPP_FCL_DEPRECATED
const CollisionGeometry* getCollisionGeometry() const
{
return cgeom.get();
......
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2013-2015, CNRS-LAAS and AIST
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
* * Neither the name of CNRS-LAAS and AIST nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
/// \author Florent Lamiraux
#ifndef FCL_DEPRECATED_HH
# define FCL_DEPRECATED_HH
// Define a suffix which can be used to tag a type, a function or a a
// variable as deprecated (i.e. it will emit a warning when using it).
//
// Tagging a function as deprecated:
// FCL_DEPRECATED void foo ();
//
// Tagging a type as deprecated:
// FCL_DEPRECATED class Foo {};
//
// Tagging a variable as deprecated:
// 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
// compilers support it.
# ifdef __GNUC__
# define FCL_DEPRECATED __attribute__ ((deprecated))
# elif defined _MSC_VER
# define FCL_DEPRECATED __declspec (deprecated)
# elif defined(clang)
# define FL_DEPRECATED \
attribute((deprecated("FCL: Use of this method is deprecated")))
# else
// If the compiler is not recognized, drop the feature.
# define FCL_DEPRECATED /* nothing */
# endif
#endif //! FCL_DEPRECATED_HH
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment