Define common actor_id_type
This commit is contained in:
parent
c0045c64fa
commit
d005074ce4
|
@ -9,6 +9,7 @@
|
|||
#include "carla/Debug.h"
|
||||
#include "carla/geom/BoundingBox.h"
|
||||
#include "carla/rpc/ActorDescription.h"
|
||||
#include "carla/rpc/ActorId.h"
|
||||
#include "carla/streaming/Token.h"
|
||||
|
||||
#include <cstring>
|
||||
|
@ -19,11 +20,9 @@ namespace rpc {
|
|||
class Actor {
|
||||
public:
|
||||
|
||||
using id_type = uint32_t;
|
||||
|
||||
Actor() = default;
|
||||
|
||||
id_type id;
|
||||
actor_id_type id;
|
||||
|
||||
ActorDescription description;
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include "carla/MsgPack.h"
|
||||
#include "carla/rpc/ActorAttribute.h"
|
||||
#include "carla/rpc/ActorId.h"
|
||||
#include "carla/rpc/String.h"
|
||||
|
||||
#include <vector>
|
||||
|
@ -20,7 +21,7 @@ namespace rpc {
|
|||
|
||||
ActorDefinition() = default;
|
||||
|
||||
uint32_t uid = 0u;
|
||||
actor_id_type uid = 0u;
|
||||
|
||||
std::string id;
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
#include "carla/MsgPack.h"
|
||||
#include "carla/rpc/ActorAttribute.h"
|
||||
#include "carla/rpc/ActorId.h"
|
||||
#include "carla/rpc/String.h"
|
||||
|
||||
#include <vector>
|
||||
|
@ -20,7 +21,7 @@ namespace rpc {
|
|||
|
||||
ActorDescription() = default;
|
||||
|
||||
uint32_t uid = 0u;
|
||||
actor_id_type uid = 0u;
|
||||
|
||||
std::string id;
|
||||
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
// Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
|
||||
// de Barcelona (UAB).
|
||||
//
|
||||
// This work is licensed under the terms of the MIT license.
|
||||
// For a copy, see <https://opensource.org/licenses/MIT>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace carla {
|
||||
namespace rpc {
|
||||
|
||||
using actor_id_type = uint32_t;
|
||||
|
||||
} // namespace rpc
|
||||
|
||||
using actor_id_type = rpc::actor_id_type;
|
||||
|
||||
} // namespace carla
|
Loading…
Reference in New Issue