-
Notifications
You must be signed in to change notification settings - Fork 287
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix API compatibility of dart 4.3 #309
Merged
Merged
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
7844e83
Enables to specify new header name of the deprecated header
jslee02 f5e890e
Deprecate LCPSolver replaced by ODELCPSolver
jslee02 0c9b31a
Merge remote-tracking branch 'origin/release-4.3' into release-4.3_fi…
jslee02 fdca9e8
Fix typo: Gazebo -> DART
jslee02 c025e3f
Fix typo: ODELCPSolver -> LCPSolver
jslee02 89534ce
Fix typo: gazebo -> dart
jslee02 4b95dec
Remove unused header inclusion
jslee02 5d23b6e
Add more comment on warning message
jslee02 150f226
Remove unused header inclusion
jslee02 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,22 +34,23 @@ | |
* POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#ifndef DART_LCPSOLVER_LCPSOLVER_H_ | ||
#define DART_LCPSOLVER_LCPSOLVER_H_ | ||
#ifndef DART_LCPSOLVER_ODELCPSOLVER_H_ | ||
#define DART_LCPSOLVER_ODELCPSOLVER_H_ | ||
|
||
#include <Eigen/Dense> | ||
#include "dart/common/Deprecated.h" | ||
|
||
namespace dart { | ||
namespace lcpsolver { | ||
|
||
/// \brief | ||
class LCPSolver { | ||
class ODELCPSolver { | ||
public: | ||
/// \brief | ||
LCPSolver(); | ||
ODELCPSolver(); | ||
|
||
/// \brief | ||
virtual ~LCPSolver(); | ||
virtual ~ODELCPSolver(); | ||
|
||
/// \brief | ||
bool Solve(const Eigen::MatrixXd& _A, | ||
|
@@ -81,7 +82,10 @@ class LCPSolver { | |
const Eigen::VectorXd& _x); | ||
}; | ||
|
||
DEPRECATED(4.3) | ||
typedef ODELCPSolver ODELCPSolver; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are the same name |
||
|
||
} // namespace lcpsolver | ||
} // namespace dart | ||
|
||
#endif // DART_LCPSOLVER_LCPSOLVER_H_ | ||
#endif // DART_LCPSOLVER_ODELCPSOLVER_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#!/bin/sh | ||
|
||
# Create a temporary file | ||
tmpFile=`mktemp /tmp/CaseSensitiveXXXXXXXX` | ||
if [ -f `echo $tmpFile | tr '[A-Z]' '[a-z]'` ] | ||
then | ||
#echo Not Case Sensitive | ||
rm $tmpFile | ||
exit 1 | ||
fi | ||
#echo Case Sensitive | ||
rm $tmpFile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#!/bin/bash | ||
lower=`echo $1 | tr '[:upper:]' '[:lower:]'` | ||
guard=DART_`echo $1 | tr '[:lower:]' '[:upper:]'`_`echo $1 | tr '[:lower:]' '[:upper:]'`_H_ | ||
cat <<END | ||
/* | ||
* Copyright 2013 Open Source Robotics Foundation | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
*/ | ||
#ifndef $guard | ||
#define $guard | ||
|
||
// Deprecated header file for case-sensitive filesystems | ||
#warning The dart/$lower/$1.h header file is deprecated \\ | ||
as of gazebo 4.3 and will be removed in the next release. | ||
#include "dart/$lower/$2.h" | ||
|
||
#endif | ||
|
||
END |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be removed after DART 5.0?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it means "removed by DART 5.0", yes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed by 36f07fb