Skip to content

Commit 070c340

Browse files
committed
use forward decls in rpc server
1 parent 6a1dc6f commit 070c340

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

src/viam/sdk/rpc/server.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
#include <sstream>
44

55
#include <boost/log/trivial.hpp>
6+
7+
#include <grpcpp/impl/service_type.h>
68
#include <grpcpp/security/server_credentials.h>
9+
#include <grpcpp/server_builder.h>
710

811
#include <viam/sdk/common/exception.hpp>
912
#include <viam/sdk/registry/registry.hpp>

src/viam/sdk/rpc/server.hpp

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@
33
/// @brief Defines the `Server` class.
44
#pragma once
55

6-
#include <grpcpp/impl/service_type.h>
7-
#include <grpcpp/security/server_credentials.h>
8-
#include <grpcpp/server_builder.h>
9-
106
#include <viam/sdk/resource/resource.hpp>
117
#include <viam/sdk/resource/resource_api.hpp>
128
#include <viam/sdk/resource/resource_server_base.hpp>
139

10+
namespace grpc {
11+
12+
class Service;
13+
class ServerCredentials;
14+
15+
class Server;
16+
class ServerBuilder;
17+
18+
} // namespace grpc
19+
1420
namespace viam {
1521

1622
// needed for later `friend` declaration.
@@ -35,7 +41,7 @@ class Server {
3541
/// @brief Registers a gRPC service.
3642
/// @param service The gRPC service to be registered.
3743
/// @throws `Exception` if called after the server has been `start`ed.
38-
void register_service(grpc::Service* service);
44+
void register_service(::grpc::Service* service);
3945

4046
/// @brief Returns reference to managed resource server.
4147
/// @param api The api of the managed resource server.
@@ -52,7 +58,7 @@ class Server {
5258
/// @param creds The server credentials; defaults to a insecure server credentials.
5359
/// @throws `Exception` if called after the server has been `start`ed.
5460
void add_listening_port(const std::string& address,
55-
std::shared_ptr<grpc::ServerCredentials> creds = nullptr);
61+
std::shared_ptr<::grpc::ServerCredentials> creds = nullptr);
5662

5763
/// @brief waits on server close, only returning when the server is closed.
5864
void wait();
@@ -65,8 +71,8 @@ class Server {
6571

6672
private:
6773
std::unordered_map<API, std::shared_ptr<ResourceServer>> managed_servers_;
68-
std::unique_ptr<grpc::ServerBuilder> builder_;
69-
std::unique_ptr<grpc::Server> server_;
74+
std::unique_ptr<::grpc::ServerBuilder> builder_;
75+
std::unique_ptr<::grpc::Server> server_;
7076
};
7177

7278
} // namespace sdk

0 commit comments

Comments
 (0)