|
1 | 1 | /*
|
2 |
| - * Copyright 2017, A. Del Prete, T. Flayols, O. Stasse, LAAS-CNRS |
| 2 | + * Copyright 2017, 2019 |
| 3 | + * LAAS-CNRS |
| 4 | + * A. Del Prete, T. Flayols, O. Stasse, F. Bailly |
3 | 5 | *
|
4 |
| - * This file is part of sot-torque-control. |
5 |
| - * sot-torque-control is free software: you can redistribute it and/or |
6 |
| - * modify it under the terms of the GNU Lesser General Public License |
7 |
| - * as published by the Free Software Foundation, either version 3 of |
8 |
| - * the License, or (at your option) any later version. |
9 |
| - * sot-torque-control is distributed in the hope that it will be |
10 |
| - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty |
11 |
| - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 |
| - * GNU Lesser General Public License for more details. You should |
13 |
| - * have received a copy of the GNU Lesser General Public License along |
14 |
| - * with sot-torque-control. If not, see <http://www.gnu.org/licenses/>. |
| 6 | + * This file is part of sot-core. |
| 7 | + * See license file. |
15 | 8 | */
|
16 | 9 |
|
17 | 10 |
|
|
24 | 17 |
|
25 | 18 | #if defined (WIN32)
|
26 | 19 | # if defined (hrp2_common_EXPORTS)
|
27 |
| -# define HRP2COMMON_EXPORT __declspec(dllexport) |
| 20 | +# define ROBOT_UTILS_COMMON_EXPORT __declspec(dllexport) |
28 | 21 | # else
|
29 |
| -# define HRP2COMMON_EXPORT __declspec(dllimport) |
| 22 | +# define ROBOT_UTILS_COMMON_EXPORT __declspec(dllimport) |
30 | 23 | # endif
|
31 | 24 | #else
|
32 |
| -# define HRP2COMMON_EXPORT |
| 25 | +# define ROBOT_UTILS_COMMON_EXPORT |
33 | 26 | #endif
|
34 | 27 |
|
35 | 28 |
|
@@ -198,8 +191,8 @@ namespace dynamicgraph {
|
198 | 191 | /// The joint limits map.
|
199 | 192 | std::map<Index,JointLimits> m_limits_map;
|
200 | 193 |
|
201 |
| - /// The name of the joint IMU is attached to |
202 |
| - std::string m_imu_joint_name; |
| 194 | + /// The name of the joint IMU is attached to |
| 195 | + std::string m_imu_joint_name; |
203 | 196 |
|
204 | 197 | /// This method creates the map between id and name.
|
205 | 198 | /// It is called each time a new link between id and name is inserted
|
|
0 commit comments