fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 02:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renaming: Server<> --> ServiceServer<>

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-14 01:20:27 +04:00
parent cefc346ebb
commit bc70390722
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/service_client.cpp
+2 -2
View File
@@ -4,7 +4,7 @@
#include <gtest/gtest.h>
#include <uavcan/service_client.hpp>
#include <uavcan/server.hpp>
#include <uavcan/service_server.hpp>
#include <uavcan/util/method_binder.hpp>
#include <root_ns_a/StringService.hpp>
#include <queue>
@@ -157,7 +157,7 @@ TEST(ServiceClient, Basic)
uavcan::DefaultDataTypeRegistrator<root_ns_a::StringService> _registrator;
// Server
uavcan::Server<root_ns_a::StringService> server(node_a.scheduler, node_a.poolmgr, node_a.buffer_provider);
uavcan::ServiceServer<root_ns_a::StringService> server(node_a.scheduler, node_a.poolmgr, node_a.buffer_provider);
ASSERT_EQ(1, server.start(stringServiceServerCallback));
{
libuavcan/test/server.cpp → libuavcan/test/service_server.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*/
#include <gtest/gtest.h>
#include <uavcan/server.hpp>
#include <uavcan/service_server.hpp>
#include <uavcan/util/method_binder.hpp>
#include <root_ns_a/StringService.hpp>
#include "clock.hpp"
@@ -34,7 +34,7 @@ struct ServerImpl
};
TEST(Server, Basic)
TEST(ServiceServer, Basic)
{
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 8, uavcan::MemPoolBlockSize> pool;
uavcan::PoolManager<1> poolmgr;
@@ -55,7 +55,7 @@ TEST(Server, Basic)
ServerImpl impl("456");
{
uavcan::Server<root_ns_a::StringService, ServerImpl::Binder> server(sch, poolmgr, buffer_provider);
uavcan::ServiceServer<root_ns_a::StringService, ServerImpl::Binder> server(sch, poolmgr, buffer_provider);
ASSERT_EQ(0, sch.getDispatcher().getNumServiceRequestListeners());
server.start(impl.bind());