From d005074ce49e234d55ac82d113f6fea61a84a13f Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Wed, 17 Oct 2018 22:44:22 +0200
Subject: [PATCH] Define common actor_id_type

---
 LibCarla/source/carla/rpc/Actor.h            |  5 ++---
 LibCarla/source/carla/rpc/ActorDefinition.h  |  3 ++-
 LibCarla/source/carla/rpc/ActorDescription.h |  3 ++-
 LibCarla/source/carla/rpc/ActorId.h          | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 LibCarla/source/carla/rpc/ActorId.h

diff --git a/LibCarla/source/carla/rpc/Actor.h b/LibCarla/source/carla/rpc/Actor.h
index 162ecbcf1..e0db41634 100644
--- a/LibCarla/source/carla/rpc/Actor.h
+++ b/LibCarla/source/carla/rpc/Actor.h
@@ -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;
 
diff --git a/LibCarla/source/carla/rpc/ActorDefinition.h b/LibCarla/source/carla/rpc/ActorDefinition.h
index cac5036cf..3380577d1 100644
--- a/LibCarla/source/carla/rpc/ActorDefinition.h
+++ b/LibCarla/source/carla/rpc/ActorDefinition.h
@@ -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;
 
diff --git a/LibCarla/source/carla/rpc/ActorDescription.h b/LibCarla/source/carla/rpc/ActorDescription.h
index 84173040d..d371381fb 100644
--- a/LibCarla/source/carla/rpc/ActorDescription.h
+++ b/LibCarla/source/carla/rpc/ActorDescription.h
@@ -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;
 
diff --git a/LibCarla/source/carla/rpc/ActorId.h b/LibCarla/source/carla/rpc/ActorId.h
new file mode 100644
index 000000000..eaf625e0e
--- /dev/null
+++ b/LibCarla/source/carla/rpc/ActorId.h
@@ -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