Refresh patches.
Debian Janitor
1 year, 6 months ago
5 | 5 | actionlib/CMakeLists.txt | 1 + |
6 | 6 | 1 file changed, 1 insertion(+) |
7 | 7 | |
8 | diff --git a/actionlib/CMakeLists.txt b/actionlib/CMakeLists.txt | |
9 | index ce583b8..d289b85 100644 | |
10 | --- a/actionlib/CMakeLists.txt | |
11 | +++ b/actionlib/CMakeLists.txt | |
8 | Index: ros-actionlib.git/actionlib/CMakeLists.txt | |
9 | =================================================================== | |
10 | --- ros-actionlib.git.orig/actionlib/CMakeLists.txt | |
11 | +++ ros-actionlib.git/actionlib/CMakeLists.txt | |
12 | 12 | @@ -20,6 +20,7 @@ catkin_package( |
13 | 13 | ) |
14 | 14 |
6 | 6 | 1 file changed, 5 insertions(+) |
7 | 7 | create mode 100644 CMakeLists.txt |
8 | 8 | |
9 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
10 | new file mode 100644 | |
11 | index 0000000..dd31640 | |
9 | Index: ros-actionlib.git/CMakeLists.txt | |
10 | =================================================================== | |
12 | 11 | --- /dev/null |
13 | +++ b/CMakeLists.txt | |
12 | +++ ros-actionlib.git/CMakeLists.txt | |
14 | 13 | @@ -0,0 +1,5 @@ |
15 | 14 | +cmake_minimum_required(VERSION 2.8.3) |
16 | 15 | +project(ros-actionlib) |
22 | 22 | actionlib/test/test_simple_action_server_deadlock.py | 2 +- |
23 | 23 | 18 files changed, 18 insertions(+), 18 deletions(-) |
24 | 24 | |
25 | diff --git a/actionlib/setup.py b/actionlib/setup.py | |
26 | index 22034dd..7bec769 100644 | |
27 | --- a/actionlib/setup.py | |
28 | +++ b/actionlib/setup.py | |
25 | Index: ros-actionlib.git/actionlib/setup.py | |
26 | =================================================================== | |
27 | --- ros-actionlib.git.orig/actionlib/setup.py | |
28 | +++ ros-actionlib.git/actionlib/setup.py | |
29 | 29 | @@ -1,4 +1,4 @@ |
30 | 30 | -#!/usr/bin/env python |
31 | 31 | +#!/usr/bin/env python3 |
32 | 32 | |
33 | 33 | from setuptools import setup |
34 | 34 | from catkin_pkg.python_setup import generate_distutils_setup |
35 | diff --git a/actionlib/src/actionlib/action_client.py b/actionlib/src/actionlib/action_client.py | |
36 | index 90eb3fe..6f9e0eb 100644 | |
37 | --- a/actionlib/src/actionlib/action_client.py | |
38 | +++ b/actionlib/src/actionlib/action_client.py | |
39 | @@ -1,4 +1,4 @@ | |
40 | -#! /usr/bin/env python | |
41 | +#! /usr/bin/env python3 | |
42 | # Copyright (c) 2009, Willow Garage, Inc. | |
43 | # All rights reserved. | |
44 | # | |
45 | diff --git a/actionlib/src/actionlib/action_server.py b/actionlib/src/actionlib/action_server.py | |
46 | index b2c1a56..301c176 100644 | |
47 | --- a/actionlib/src/actionlib/action_server.py | |
48 | +++ b/actionlib/src/actionlib/action_server.py | |
49 | @@ -1,4 +1,4 @@ | |
50 | -#! /usr/bin/env python | |
51 | +#! /usr/bin/env python3 | |
52 | # Copyright (c) 2009, Willow Garage, Inc. | |
53 | # All rights reserved. | |
54 | # | |
55 | diff --git a/actionlib/src/actionlib/exceptions.py b/actionlib/src/actionlib/exceptions.py | |
56 | index ccc49b2..b3f2d1b 100644 | |
57 | --- a/actionlib/src/actionlib/exceptions.py | |
58 | +++ b/actionlib/src/actionlib/exceptions.py | |
35 | Index: ros-actionlib.git/actionlib/src/actionlib/action_client.py | |
36 | =================================================================== | |
37 | --- ros-actionlib.git.orig/actionlib/src/actionlib/action_client.py | |
38 | +++ ros-actionlib.git/actionlib/src/actionlib/action_client.py | |
39 | @@ -1,4 +1,4 @@ | |
40 | -#! /usr/bin/env python | |
41 | +#! /usr/bin/env python3 | |
42 | # Copyright (c) 2009, Willow Garage, Inc. | |
43 | # All rights reserved. | |
44 | # | |
45 | Index: ros-actionlib.git/actionlib/src/actionlib/action_server.py | |
46 | =================================================================== | |
47 | --- ros-actionlib.git.orig/actionlib/src/actionlib/action_server.py | |
48 | +++ ros-actionlib.git/actionlib/src/actionlib/action_server.py | |
49 | @@ -1,4 +1,4 @@ | |
50 | -#! /usr/bin/env python | |
51 | +#! /usr/bin/env python3 | |
52 | # Copyright (c) 2009, Willow Garage, Inc. | |
53 | # All rights reserved. | |
54 | # | |
55 | Index: ros-actionlib.git/actionlib/src/actionlib/exceptions.py | |
56 | =================================================================== | |
57 | --- ros-actionlib.git.orig/actionlib/src/actionlib/exceptions.py | |
58 | +++ ros-actionlib.git/actionlib/src/actionlib/exceptions.py | |
59 | 59 | @@ -1,4 +1,4 @@ |
60 | 60 | -#! /usr/bin/env python |
61 | 61 | +#! /usr/bin/env python3 |
62 | 62 | # Copyright (c) 2010, Willow Garage, Inc. |
63 | 63 | # All rights reserved. |
64 | 64 | # |
65 | diff --git a/actionlib/src/actionlib/goal_id_generator.py b/actionlib/src/actionlib/goal_id_generator.py | |
66 | index 64a7ce8..d9ede27 100644 | |
67 | --- a/actionlib/src/actionlib/goal_id_generator.py | |
68 | +++ b/actionlib/src/actionlib/goal_id_generator.py | |
69 | @@ -1,4 +1,4 @@ | |
70 | -#! /usr/bin/env python | |
71 | +#! /usr/bin/env python3 | |
72 | # Copyright (c) 2009, Willow Garage, Inc. | |
73 | # All rights reserved. | |
74 | # | |
75 | diff --git a/actionlib/src/actionlib/simple_action_client.py b/actionlib/src/actionlib/simple_action_client.py | |
76 | index da70958..7c054db 100644 | |
77 | --- a/actionlib/src/actionlib/simple_action_client.py | |
78 | +++ b/actionlib/src/actionlib/simple_action_client.py | |
79 | @@ -1,4 +1,4 @@ | |
80 | -#! /usr/bin/env python | |
81 | +#! /usr/bin/env python3 | |
82 | # Copyright (c) 2009, Willow Garage, Inc. | |
83 | # All rights reserved. | |
84 | # | |
85 | diff --git a/actionlib/src/actionlib/simple_action_server.py b/actionlib/src/actionlib/simple_action_server.py | |
86 | index 710bf82..2cf4054 100644 | |
87 | --- a/actionlib/src/actionlib/simple_action_server.py | |
88 | +++ b/actionlib/src/actionlib/simple_action_server.py | |
89 | @@ -1,4 +1,4 @@ | |
90 | -#! /usr/bin/env python | |
91 | +#! /usr/bin/env python3 | |
92 | # Copyright (c) 2009, Willow Garage, Inc. | |
93 | # All rights reserved. | |
94 | # | |
95 | diff --git a/actionlib/test/exercise_simple_client.py b/actionlib/test/exercise_simple_client.py | |
96 | index 172bca8..a27e38f 100755 | |
97 | --- a/actionlib/test/exercise_simple_client.py | |
98 | +++ b/actionlib/test/exercise_simple_client.py | |
99 | @@ -1,4 +1,4 @@ | |
100 | -#! /usr/bin/env python | |
101 | +#! /usr/bin/env python3 | |
102 | # Copyright (c) 2009, Willow Garage, Inc. | |
103 | # All rights reserved. | |
104 | # | |
105 | diff --git a/actionlib/test/mock_simple_server.py b/actionlib/test/mock_simple_server.py | |
106 | index 8dadfb9..9f9d0e4 100755 | |
107 | --- a/actionlib/test/mock_simple_server.py | |
108 | +++ b/actionlib/test/mock_simple_server.py | |
109 | @@ -1,4 +1,4 @@ | |
110 | -#! /usr/bin/env python | |
111 | +#! /usr/bin/env python3 | |
112 | # Copyright (c) 2009, Willow Garage, Inc. | |
113 | # All rights reserved. | |
114 | # | |
115 | diff --git a/actionlib/test/ref_server.py b/actionlib/test/ref_server.py | |
116 | index c9c600b..f54860f 100755 | |
117 | --- a/actionlib/test/ref_server.py | |
118 | +++ b/actionlib/test/ref_server.py | |
119 | @@ -1,4 +1,4 @@ | |
120 | -#!/usr/bin/env python | |
121 | +#!/usr/bin/env python3 | |
122 | # Copyright (c) 2009, Willow Garage, Inc. | |
123 | # All rights reserved. | |
124 | # | |
125 | diff --git a/actionlib/test/ref_simple_server.py b/actionlib/test/ref_simple_server.py | |
126 | index 901db9d..8efca33 100755 | |
127 | --- a/actionlib/test/ref_simple_server.py | |
128 | +++ b/actionlib/test/ref_simple_server.py | |
129 | @@ -1,4 +1,4 @@ | |
130 | -#!/usr/bin/env python | |
131 | +#!/usr/bin/env python3 | |
132 | # Copyright (c) 2009, Willow Garage, Inc. | |
133 | # All rights reserved. | |
134 | # | |
135 | diff --git a/actionlib/test/simple_action_server_deadlock_companion.py b/actionlib/test/simple_action_server_deadlock_companion.py | |
136 | index ba96684..7cdba0c 100755 | |
137 | --- a/actionlib/test/simple_action_server_deadlock_companion.py | |
138 | +++ b/actionlib/test/simple_action_server_deadlock_companion.py | |
65 | Index: ros-actionlib.git/actionlib/src/actionlib/goal_id_generator.py | |
66 | =================================================================== | |
67 | --- ros-actionlib.git.orig/actionlib/src/actionlib/goal_id_generator.py | |
68 | +++ ros-actionlib.git/actionlib/src/actionlib/goal_id_generator.py | |
69 | @@ -1,4 +1,4 @@ | |
70 | -#! /usr/bin/env python | |
71 | +#! /usr/bin/env python3 | |
72 | # Copyright (c) 2009, Willow Garage, Inc. | |
73 | # All rights reserved. | |
74 | # | |
75 | Index: ros-actionlib.git/actionlib/src/actionlib/simple_action_client.py | |
76 | =================================================================== | |
77 | --- ros-actionlib.git.orig/actionlib/src/actionlib/simple_action_client.py | |
78 | +++ ros-actionlib.git/actionlib/src/actionlib/simple_action_client.py | |
79 | @@ -1,4 +1,4 @@ | |
80 | -#! /usr/bin/env python | |
81 | +#! /usr/bin/env python3 | |
82 | # Copyright (c) 2009, Willow Garage, Inc. | |
83 | # All rights reserved. | |
84 | # | |
85 | Index: ros-actionlib.git/actionlib/src/actionlib/simple_action_server.py | |
86 | =================================================================== | |
87 | --- ros-actionlib.git.orig/actionlib/src/actionlib/simple_action_server.py | |
88 | +++ ros-actionlib.git/actionlib/src/actionlib/simple_action_server.py | |
89 | @@ -1,4 +1,4 @@ | |
90 | -#! /usr/bin/env python | |
91 | +#! /usr/bin/env python3 | |
92 | # Copyright (c) 2009, Willow Garage, Inc. | |
93 | # All rights reserved. | |
94 | # | |
95 | Index: ros-actionlib.git/actionlib/test/exercise_simple_client.py | |
96 | =================================================================== | |
97 | --- ros-actionlib.git.orig/actionlib/test/exercise_simple_client.py | |
98 | +++ ros-actionlib.git/actionlib/test/exercise_simple_client.py | |
99 | @@ -1,4 +1,4 @@ | |
100 | -#! /usr/bin/env python | |
101 | +#! /usr/bin/env python3 | |
102 | # Copyright (c) 2009, Willow Garage, Inc. | |
103 | # All rights reserved. | |
104 | # | |
105 | Index: ros-actionlib.git/actionlib/test/mock_simple_server.py | |
106 | =================================================================== | |
107 | --- ros-actionlib.git.orig/actionlib/test/mock_simple_server.py | |
108 | +++ ros-actionlib.git/actionlib/test/mock_simple_server.py | |
109 | @@ -1,4 +1,4 @@ | |
110 | -#! /usr/bin/env python | |
111 | +#! /usr/bin/env python3 | |
112 | # Copyright (c) 2009, Willow Garage, Inc. | |
113 | # All rights reserved. | |
114 | # | |
115 | Index: ros-actionlib.git/actionlib/test/ref_server.py | |
116 | =================================================================== | |
117 | --- ros-actionlib.git.orig/actionlib/test/ref_server.py | |
118 | +++ ros-actionlib.git/actionlib/test/ref_server.py | |
119 | @@ -1,4 +1,4 @@ | |
120 | -#!/usr/bin/env python | |
121 | +#!/usr/bin/env python3 | |
122 | # Copyright (c) 2009, Willow Garage, Inc. | |
123 | # All rights reserved. | |
124 | # | |
125 | Index: ros-actionlib.git/actionlib/test/ref_simple_server.py | |
126 | =================================================================== | |
127 | --- ros-actionlib.git.orig/actionlib/test/ref_simple_server.py | |
128 | +++ ros-actionlib.git/actionlib/test/ref_simple_server.py | |
129 | @@ -1,4 +1,4 @@ | |
130 | -#!/usr/bin/env python | |
131 | +#!/usr/bin/env python3 | |
132 | # Copyright (c) 2009, Willow Garage, Inc. | |
133 | # All rights reserved. | |
134 | # | |
135 | Index: ros-actionlib.git/actionlib/test/simple_action_server_deadlock_companion.py | |
136 | =================================================================== | |
137 | --- ros-actionlib.git.orig/actionlib/test/simple_action_server_deadlock_companion.py | |
138 | +++ ros-actionlib.git/actionlib/test/simple_action_server_deadlock_companion.py | |
139 | 139 | @@ -1,4 +1,4 @@ |
140 | 140 | -#! /usr/bin/env python |
141 | 141 | +#! /usr/bin/env python3 |
142 | 142 | # |
143 | 143 | # Copyright (c) 2013, Miguel Sarabia |
144 | 144 | # Imperial College London |
145 | diff --git a/actionlib/test/simple_python_client_test.py b/actionlib/test/simple_python_client_test.py | |
146 | index 6e67148..369461a 100755 | |
147 | --- a/actionlib/test/simple_python_client_test.py | |
148 | +++ b/actionlib/test/simple_python_client_test.py | |
149 | @@ -1,4 +1,4 @@ | |
150 | -#! /usr/bin/env python | |
151 | +#! /usr/bin/env python3 | |
152 | # Copyright (c) 2009, Willow Garage, Inc. | |
153 | # All rights reserved. | |
154 | # | |
155 | diff --git a/actionlib/test/test_imports.py b/actionlib/test/test_imports.py | |
156 | index d5e3381..914a512 100755 | |
157 | --- a/actionlib/test/test_imports.py | |
158 | +++ b/actionlib/test/test_imports.py | |
159 | @@ -1,4 +1,4 @@ | |
160 | -#!/usr/bin/env python | |
161 | +#!/usr/bin/env python3 | |
162 | # Copyright (c) 2009, Willow Garage, Inc. | |
163 | # All rights reserved. | |
164 | # | |
165 | diff --git a/actionlib/test/test_ref_action_server.py b/actionlib/test/test_ref_action_server.py | |
166 | index 182b252..d5ec145 100755 | |
167 | --- a/actionlib/test/test_ref_action_server.py | |
168 | +++ b/actionlib/test/test_ref_action_server.py | |
169 | @@ -1,4 +1,4 @@ | |
170 | -#! /usr/bin/env python | |
171 | +#! /usr/bin/env python3 | |
172 | # Copyright (c) 2009, Willow Garage, Inc. | |
173 | # All rights reserved. | |
174 | # | |
175 | diff --git a/actionlib/test/test_ref_simple_action_server.py b/actionlib/test/test_ref_simple_action_server.py | |
176 | index 8602484..4e3bcd3 100755 | |
177 | --- a/actionlib/test/test_ref_simple_action_server.py | |
178 | +++ b/actionlib/test/test_ref_simple_action_server.py | |
179 | @@ -1,4 +1,4 @@ | |
180 | -#! /usr/bin/env python | |
181 | +#! /usr/bin/env python3 | |
182 | # Copyright (c) 2009, Willow Garage, Inc. | |
183 | # All rights reserved. | |
184 | # | |
185 | diff --git a/actionlib/test/test_server_components.py b/actionlib/test/test_server_components.py | |
186 | index 869aca5..31c9e78 100755 | |
187 | --- a/actionlib/test/test_server_components.py | |
188 | +++ b/actionlib/test/test_server_components.py | |
189 | @@ -1,4 +1,4 @@ | |
190 | -#!/usr/bin/env python | |
191 | +#!/usr/bin/env python3 | |
192 | # Copyright (c) 2009, Willow Garage, Inc. | |
193 | # All rights reserved. | |
194 | # | |
195 | diff --git a/actionlib/test/test_simple_action_server_deadlock.py b/actionlib/test/test_simple_action_server_deadlock.py | |
196 | index e892931..568e862 100755 | |
197 | --- a/actionlib/test/test_simple_action_server_deadlock.py | |
198 | +++ b/actionlib/test/test_simple_action_server_deadlock.py | |
145 | Index: ros-actionlib.git/actionlib/test/simple_python_client_test.py | |
146 | =================================================================== | |
147 | --- ros-actionlib.git.orig/actionlib/test/simple_python_client_test.py | |
148 | +++ ros-actionlib.git/actionlib/test/simple_python_client_test.py | |
149 | @@ -1,4 +1,4 @@ | |
150 | -#! /usr/bin/env python | |
151 | +#! /usr/bin/env python3 | |
152 | # Copyright (c) 2009, Willow Garage, Inc. | |
153 | # All rights reserved. | |
154 | # | |
155 | Index: ros-actionlib.git/actionlib/test/test_imports.py | |
156 | =================================================================== | |
157 | --- ros-actionlib.git.orig/actionlib/test/test_imports.py | |
158 | +++ ros-actionlib.git/actionlib/test/test_imports.py | |
159 | @@ -1,4 +1,4 @@ | |
160 | -#!/usr/bin/env python | |
161 | +#!/usr/bin/env python3 | |
162 | # Copyright (c) 2009, Willow Garage, Inc. | |
163 | # All rights reserved. | |
164 | # | |
165 | Index: ros-actionlib.git/actionlib/test/test_ref_action_server.py | |
166 | =================================================================== | |
167 | --- ros-actionlib.git.orig/actionlib/test/test_ref_action_server.py | |
168 | +++ ros-actionlib.git/actionlib/test/test_ref_action_server.py | |
169 | @@ -1,4 +1,4 @@ | |
170 | -#! /usr/bin/env python | |
171 | +#! /usr/bin/env python3 | |
172 | # Copyright (c) 2009, Willow Garage, Inc. | |
173 | # All rights reserved. | |
174 | # | |
175 | Index: ros-actionlib.git/actionlib/test/test_ref_simple_action_server.py | |
176 | =================================================================== | |
177 | --- ros-actionlib.git.orig/actionlib/test/test_ref_simple_action_server.py | |
178 | +++ ros-actionlib.git/actionlib/test/test_ref_simple_action_server.py | |
179 | @@ -1,4 +1,4 @@ | |
180 | -#! /usr/bin/env python | |
181 | +#! /usr/bin/env python3 | |
182 | # Copyright (c) 2009, Willow Garage, Inc. | |
183 | # All rights reserved. | |
184 | # | |
185 | Index: ros-actionlib.git/actionlib/test/test_server_components.py | |
186 | =================================================================== | |
187 | --- ros-actionlib.git.orig/actionlib/test/test_server_components.py | |
188 | +++ ros-actionlib.git/actionlib/test/test_server_components.py | |
189 | @@ -1,4 +1,4 @@ | |
190 | -#!/usr/bin/env python | |
191 | +#!/usr/bin/env python3 | |
192 | # Copyright (c) 2009, Willow Garage, Inc. | |
193 | # All rights reserved. | |
194 | # | |
195 | Index: ros-actionlib.git/actionlib/test/test_simple_action_server_deadlock.py | |
196 | =================================================================== | |
197 | --- ros-actionlib.git.orig/actionlib/test/test_simple_action_server_deadlock.py | |
198 | +++ ros-actionlib.git/actionlib/test/test_simple_action_server_deadlock.py | |
199 | 199 | @@ -1,4 +1,4 @@ |
200 | 200 | -#! /usr/bin/env python |
201 | 201 | +#! /usr/bin/env python3 |
6 | 6 | actionlib/test/exercise_simple_client.cpp | 4 ++-- |
7 | 7 | 1 file changed, 2 insertions(+), 2 deletions(-) |
8 | 8 | |
9 | diff --git a/actionlib/test/exercise_simple_client.cpp b/actionlib/test/exercise_simple_client.cpp | |
10 | index e7d5dd0..57f35b9 100644 | |
11 | --- a/actionlib/test/exercise_simple_client.cpp | |
12 | +++ b/actionlib/test/exercise_simple_client.cpp | |
13 | @@ -69,8 +69,8 @@ TEST_F(SimpleClientFixture, just_succeed) { | |
9 | Index: ros-actionlib.git/actionlib/test/exercise_simple_client.cpp | |
10 | =================================================================== | |
11 | --- ros-actionlib.git.orig/actionlib/test/exercise_simple_client.cpp | |
12 | +++ ros-actionlib.git/actionlib/test/exercise_simple_client.cpp | |
13 | @@ -69,8 +69,8 @@ TEST_F(SimpleClientFixture, just_succeed | |
14 | 14 | goal.the_result = 42; |
15 | 15 | ac_.sendGoal(goal); |
16 | 16 | ac_.waitForResult(default_wait_); |
18 | 18 | actionlib/test/simple_execute_ref_server.cpp | 2 +- |
19 | 19 | 14 files changed, 36 insertions(+), 36 deletions(-) |
20 | 20 | |
21 | diff --git a/actionlib/include/actionlib/client/action_client.h b/actionlib/include/actionlib/client/action_client.h | |
22 | index cfd64af..cb79ae2 100644 | |
23 | --- a/actionlib/include/actionlib/client/action_client.h | |
24 | +++ b/actionlib/include/actionlib/client/action_client.h | |
21 | Index: ros-actionlib.git/actionlib/include/actionlib/client/action_client.h | |
22 | =================================================================== | |
23 | --- ros-actionlib.git.orig/actionlib/include/actionlib/client/action_client.h | |
24 | +++ ros-actionlib.git/actionlib/include/actionlib/client/action_client.h | |
25 | 25 | @@ -236,17 +236,17 @@ private: |
26 | 26 | |
27 | 27 | // Start publishers and subscribers |
55 | 55 | ) |
56 | 56 | ); |
57 | 57 | return n_.subscribe(ops); |
58 | diff --git a/actionlib/include/actionlib/client/goal_manager_imp.h b/actionlib/include/actionlib/client/goal_manager_imp.h | |
59 | index 789ada0..30dbc35 100644 | |
60 | --- a/actionlib/include/actionlib/client/goal_manager_imp.h | |
61 | +++ b/actionlib/include/actionlib/client/goal_manager_imp.h | |
62 | @@ -74,7 +74,7 @@ ClientGoalHandle<ActionSpec> GoalManager<ActionSpec>::initGoal(const Goal & goal | |
58 | Index: ros-actionlib.git/actionlib/include/actionlib/client/goal_manager_imp.h | |
59 | =================================================================== | |
60 | --- ros-actionlib.git.orig/actionlib/include/actionlib/client/goal_manager_imp.h | |
61 | +++ ros-actionlib.git/actionlib/include/actionlib/client/goal_manager_imp.h | |
62 | @@ -74,7 +74,7 @@ ClientGoalHandle<ActionSpec> GoalManager | |
63 | 63 | |
64 | 64 | boost::recursive_mutex::scoped_lock lock(list_mutex_); |
65 | 65 | typename ManagedListT::Handle list_handle = |
68 | 68 | |
69 | 69 | if (send_goal_func_) { |
70 | 70 | send_goal_func_(action_goal); |
71 | diff --git a/actionlib/include/actionlib/client/simple_action_client.h b/actionlib/include/actionlib/client/simple_action_client.h | |
72 | index 52637ed..cfbd206 100644 | |
73 | --- a/actionlib/include/actionlib/client/simple_action_client.h | |
74 | +++ b/actionlib/include/actionlib/client/simple_action_client.h | |
75 | @@ -330,8 +330,8 @@ void SimpleActionClient<ActionSpec>::sendGoal(const Goal & goal, | |
71 | Index: ros-actionlib.git/actionlib/include/actionlib/client/simple_action_client.h | |
72 | =================================================================== | |
73 | --- ros-actionlib.git.orig/actionlib/include/actionlib/client/simple_action_client.h | |
74 | +++ ros-actionlib.git/actionlib/include/actionlib/client/simple_action_client.h | |
75 | @@ -330,8 +330,8 @@ void SimpleActionClient<ActionSpec>::sen | |
76 | 76 | cur_simple_state_ = SimpleGoalState::PENDING; |
77 | 77 | |
78 | 78 | // Send the goal to the ActionServer |
83 | 83 | } |
84 | 84 | |
85 | 85 | template<class ActionSpec> |
86 | diff --git a/actionlib/include/actionlib/managed_list.h b/actionlib/include/actionlib/managed_list.h | |
87 | index 11c4889..b7f9231 100644 | |
88 | --- a/actionlib/include/actionlib/managed_list.h | |
89 | +++ b/actionlib/include/actionlib/managed_list.h | |
86 | Index: ros-actionlib.git/actionlib/include/actionlib/managed_list.h | |
87 | =================================================================== | |
88 | --- ros-actionlib.git.orig/actionlib/include/actionlib/managed_list.h | |
89 | +++ ros-actionlib.git/actionlib/include/actionlib/managed_list.h | |
90 | 90 | @@ -218,7 +218,7 @@ private: |
91 | 91 | */ |
92 | 92 | Handle add(const T & elem) |
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | diff --git a/actionlib/include/actionlib/one_shot_timer.h b/actionlib/include/actionlib/one_shot_timer.h | |
100 | index e462abb..55d19bb 100644 | |
101 | --- a/actionlib/include/actionlib/one_shot_timer.h | |
102 | +++ b/actionlib/include/actionlib/one_shot_timer.h | |
99 | Index: ros-actionlib.git/actionlib/include/actionlib/one_shot_timer.h | |
100 | =================================================================== | |
101 | --- ros-actionlib.git.orig/actionlib/include/actionlib/one_shot_timer.h | |
102 | +++ ros-actionlib.git/actionlib/include/actionlib/one_shot_timer.h | |
103 | 103 | @@ -36,7 +36,7 @@ |
104 | 104 | #define ACTIONLIB__ONE_SHOT_TIMER_H_ |
105 | 105 | |
118 | 118 | } |
119 | 119 | |
120 | 120 | void registerOneShotCb(boost::function<void(const ros::TimerEvent & e)> callback) |
121 | diff --git a/actionlib/include/actionlib/server/action_server_imp.h b/actionlib/include/actionlib/server/action_server_imp.h | |
122 | index 2a088b1..837b9c4 100644 | |
123 | --- a/actionlib/include/actionlib/server/action_server_imp.h | |
124 | +++ b/actionlib/include/actionlib/server/action_server_imp.h | |
125 | @@ -172,15 +172,15 @@ void ActionServer<ActionSpec>::initialize() | |
121 | Index: ros-actionlib.git/actionlib/include/actionlib/server/action_server_imp.h | |
122 | =================================================================== | |
123 | --- ros-actionlib.git.orig/actionlib/include/actionlib/server/action_server_imp.h | |
124 | +++ ros-actionlib.git/actionlib/include/actionlib/server/action_server_imp.h | |
125 | @@ -172,15 +172,15 @@ void ActionServer<ActionSpec>::initializ | |
126 | 126 | |
127 | 127 | if (status_frequency > 0) { |
128 | 128 | status_timer_ = node_.createTimer(ros::Duration(1.0 / status_frequency), |
141 | 141 | } |
142 | 142 | |
143 | 143 | template<class ActionSpec> |
144 | diff --git a/actionlib/include/actionlib/server/service_server_imp.h b/actionlib/include/actionlib/server/service_server_imp.h | |
145 | index ac5444d..2f0265e 100644 | |
146 | --- a/actionlib/include/actionlib/server/service_server_imp.h | |
147 | +++ b/actionlib/include/actionlib/server/service_server_imp.h | |
148 | @@ -58,7 +58,7 @@ ServiceServerImpT<ActionSpec>::ServiceServerImpT(ros::NodeHandle n, std::string | |
144 | Index: ros-actionlib.git/actionlib/include/actionlib/server/service_server_imp.h | |
145 | =================================================================== | |
146 | --- ros-actionlib.git.orig/actionlib/include/actionlib/server/service_server_imp.h | |
147 | +++ ros-actionlib.git/actionlib/include/actionlib/server/service_server_imp.h | |
148 | @@ -58,7 +58,7 @@ ServiceServerImpT<ActionSpec>::ServiceSe | |
149 | 149 | : service_cb_(service_cb) |
150 | 150 | { |
151 | 151 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n, name, |
154 | 154 | as_->start(); |
155 | 155 | } |
156 | 156 | |
157 | diff --git a/actionlib/include/actionlib/server/simple_action_server_imp.h b/actionlib/include/actionlib/server/simple_action_server_imp.h | |
158 | index a5e51bb..d8b906a 100644 | |
159 | --- a/actionlib/include/actionlib/server/simple_action_server_imp.h | |
160 | +++ b/actionlib/include/actionlib/server/simple_action_server_imp.h | |
161 | @@ -56,8 +56,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(std::string name, | |
157 | Index: ros-actionlib.git/actionlib/include/actionlib/server/simple_action_server_imp.h | |
158 | =================================================================== | |
159 | --- ros-actionlib.git.orig/actionlib/include/actionlib/server/simple_action_server_imp.h | |
160 | +++ ros-actionlib.git/actionlib/include/actionlib/server/simple_action_server_imp.h | |
161 | @@ -56,8 +56,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
162 | 162 | |
163 | 163 | // create the action server |
164 | 164 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n_, name, |
169 | 169 | auto_start)); |
170 | 170 | } |
171 | 171 | |
172 | @@ -68,8 +68,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(std::string name, bool auto_s | |
172 | @@ -68,8 +68,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
173 | 173 | { |
174 | 174 | // create the action server |
175 | 175 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n_, name, |
179 | 179 | + boost::bind(&SimpleActionServer::preemptCallback, this, boost::placeholders::_1), |
180 | 180 | auto_start)); |
181 | 181 | |
182 | if (execute_callback_ != NULL) { | |
183 | @@ -85,8 +85,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(std::string name, | |
182 | if (execute_callback_) { | |
183 | @@ -85,8 +85,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
184 | 184 | { |
185 | 185 | // create the action server |
186 | 186 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n_, name, |
190 | 190 | + boost::bind(&SimpleActionServer::preemptCallback, this, boost::placeholders::_1), |
191 | 191 | true)); |
192 | 192 | |
193 | if (execute_callback_ != NULL) { | |
194 | @@ -104,8 +104,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(ros::NodeHandle n, std::strin | |
193 | if (execute_callback_) { | |
194 | @@ -104,8 +104,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
195 | 195 | { |
196 | 196 | // create the action server |
197 | 197 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n, name, |
201 | 201 | + boost::bind(&SimpleActionServer::preemptCallback, this, boost::placeholders::_1), |
202 | 202 | auto_start)); |
203 | 203 | |
204 | if (execute_callback_ != NULL) { | |
205 | @@ -121,8 +121,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(ros::NodeHandle n, std::strin | |
204 | if (execute_callback_) { | |
205 | @@ -121,8 +121,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
206 | 206 | { |
207 | 207 | // create the action server |
208 | 208 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n, name, |
212 | 212 | + boost::bind(&SimpleActionServer::preemptCallback, this, boost::placeholders::_1), |
213 | 213 | auto_start)); |
214 | 214 | |
215 | if (execute_callback_ != NULL) { | |
216 | @@ -138,8 +138,8 @@ SimpleActionServer<ActionSpec>::SimpleActionServer(ros::NodeHandle n, std::strin | |
215 | if (execute_callback_) { | |
216 | @@ -138,8 +138,8 @@ SimpleActionServer<ActionSpec>::SimpleAc | |
217 | 217 | { |
218 | 218 | // create the action server |
219 | 219 | as_ = boost::shared_ptr<ActionServer<ActionSpec> >(new ActionServer<ActionSpec>(n, name, |
223 | 223 | + boost::bind(&SimpleActionServer::preemptCallback, this, boost::placeholders::_1), |
224 | 224 | true)); |
225 | 225 | |
226 | if (execute_callback_ != NULL) { | |
227 | diff --git a/actionlib/test/add_two_ints_server.cpp b/actionlib/test/add_two_ints_server.cpp | |
228 | index 098c315..84ddace 100644 | |
229 | --- a/actionlib/test/add_two_ints_server.cpp | |
230 | +++ b/actionlib/test/add_two_ints_server.cpp | |
226 | if (execute_callback_) { | |
227 | Index: ros-actionlib.git/actionlib/test/add_two_ints_server.cpp | |
228 | =================================================================== | |
229 | --- ros-actionlib.git.orig/actionlib/test/add_two_ints_server.cpp | |
230 | +++ ros-actionlib.git/actionlib/test/add_two_ints_server.cpp | |
231 | 231 | @@ -53,7 +53,7 @@ int main(int argc, char ** argv) |
232 | 232 | |
233 | 233 | actionlib::ServiceServer service = actionlib::advertiseService<actionlib::TwoIntsAction>(n, |
237 | 237 | |
238 | 238 | ros::spin(); |
239 | 239 | |
240 | diff --git a/actionlib/test/destruction_guard_test.cpp b/actionlib/test/destruction_guard_test.cpp | |
241 | index a497124..5473b1d 100644 | |
242 | --- a/actionlib/test/destruction_guard_test.cpp | |
243 | +++ b/actionlib/test/destruction_guard_test.cpp | |
240 | Index: ros-actionlib.git/actionlib/test/destruction_guard_test.cpp | |
241 | =================================================================== | |
242 | --- ros-actionlib.git.orig/actionlib/test/destruction_guard_test.cpp | |
243 | +++ ros-actionlib.git/actionlib/test/destruction_guard_test.cpp | |
244 | 244 | @@ -37,7 +37,7 @@ |
245 | 245 | #include <gtest/gtest.h> |
246 | 246 | #include <actionlib/destruction_guard.h> |
250 | 250 | |
251 | 251 | using namespace actionlib; |
252 | 252 | |
253 | diff --git a/actionlib/test/ref_server.cpp b/actionlib/test/ref_server.cpp | |
254 | index 1da0ab5..7aede23 100644 | |
255 | --- a/actionlib/test/ref_server.cpp | |
256 | +++ b/actionlib/test/ref_server.cpp | |
253 | Index: ros-actionlib.git/actionlib/test/ref_server.cpp | |
254 | =================================================================== | |
255 | --- ros-actionlib.git.orig/actionlib/test/ref_server.cpp | |
256 | +++ ros-actionlib.git/actionlib/test/ref_server.cpp | |
257 | 257 | @@ -61,8 +61,8 @@ using namespace actionlib; |
258 | 258 | |
259 | 259 | RefServer::RefServer(ros::NodeHandle & n, const std::string & name) |
265 | 265 | false) |
266 | 266 | { |
267 | 267 | start(); |
268 | diff --git a/actionlib/test/server_goal_handle_destruction.cpp b/actionlib/test/server_goal_handle_destruction.cpp | |
269 | index 9e179c7..ed12d2b 100644 | |
270 | --- a/actionlib/test/server_goal_handle_destruction.cpp | |
271 | +++ b/actionlib/test/server_goal_handle_destruction.cpp | |
272 | @@ -67,7 +67,7 @@ ServerGoalHandleDestructionTester::ServerGoalHandleDestructionTester() | |
268 | Index: ros-actionlib.git/actionlib/test/server_goal_handle_destruction.cpp | |
269 | =================================================================== | |
270 | --- ros-actionlib.git.orig/actionlib/test/server_goal_handle_destruction.cpp | |
271 | +++ ros-actionlib.git/actionlib/test/server_goal_handle_destruction.cpp | |
272 | @@ -67,7 +67,7 @@ ServerGoalHandleDestructionTester::Serve | |
273 | 273 | as_ = new ActionServer<TestAction>(nh_, "reference_action", false); |
274 | 274 | as_->start(); |
275 | 275 | as_->registerGoalCallback(boost::bind(&ServerGoalHandleDestructionTester::goalCallback, this, |
278 | 278 | gh_ = new GoalHandle(); |
279 | 279 | } |
280 | 280 | |
281 | diff --git a/actionlib/test/simple_client_test.cpp b/actionlib/test/simple_client_test.cpp | |
282 | index 341bbc9..ea40050 100644 | |
283 | --- a/actionlib/test/simple_client_test.cpp | |
284 | +++ b/actionlib/test/simple_client_test.cpp | |
281 | Index: ros-actionlib.git/actionlib/test/simple_client_test.cpp | |
282 | =================================================================== | |
283 | --- ros-actionlib.git.orig/actionlib/test/simple_client_test.cpp | |
284 | +++ ros-actionlib.git/actionlib/test/simple_client_test.cpp | |
285 | 285 | @@ -106,7 +106,7 @@ TEST(SimpleClient, easy_callback) |
286 | 286 | |
287 | 287 | bool called = false; |
291 | 291 | client.sendGoal(goal, func); |
292 | 292 | finished = client.waitForResult(ros::Duration(10.0)); |
293 | 293 | ASSERT_TRUE(finished); |
294 | diff --git a/actionlib/test/simple_execute_ref_server.cpp b/actionlib/test/simple_execute_ref_server.cpp | |
295 | index 57aa9cd..b663ec4 100644 | |
296 | --- a/actionlib/test/simple_execute_ref_server.cpp | |
297 | +++ b/actionlib/test/simple_execute_ref_server.cpp | |
294 | Index: ros-actionlib.git/actionlib/test/simple_execute_ref_server.cpp | |
295 | =================================================================== | |
296 | --- ros-actionlib.git.orig/actionlib/test/simple_execute_ref_server.cpp | |
297 | +++ ros-actionlib.git/actionlib/test/simple_execute_ref_server.cpp | |
298 | 298 | @@ -61,7 +61,7 @@ using namespace actionlib; |
299 | 299 | |
300 | 300 | SimpleExecuteRefServer::SimpleExecuteRefServer() |
5 | 5 | actionlib/test/test_python_server_components.launch | 2 +- |
6 | 6 | 1 file changed, 1 insertion(+), 1 deletion(-) |
7 | 7 | |
8 | diff --git a/actionlib/test/test_python_server_components.launch b/actionlib/test/test_python_server_components.launch | |
9 | index 733c4f3..46ca18a 100644 | |
10 | --- a/actionlib/test/test_python_server_components.launch | |
11 | +++ b/actionlib/test/test_python_server_components.launch | |
8 | Index: ros-actionlib.git/actionlib/test/test_python_server_components.launch | |
9 | =================================================================== | |
10 | --- ros-actionlib.git.orig/actionlib/test/test_python_server_components.launch | |
11 | +++ ros-actionlib.git/actionlib/test/test_python_server_components.launch | |
12 | 12 | @@ -1,3 +1,3 @@ |
13 | 13 | <launch> |
14 | 14 | - <test test-name="test_goal_id_generator" pkg="actionlib" type="test_server_components.py" /> |