From 352ed28b3bdb706759f7baff72ddecbd25e5733a Mon Sep 17 00:00:00 2001 From: George Hotz Date: Sun, 2 Feb 2020 23:28:39 -0800 Subject: [PATCH] blueprint better --- LibCarla/source/carla/client/BlueprintLibrary.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/LibCarla/source/carla/client/BlueprintLibrary.h b/LibCarla/source/carla/client/BlueprintLibrary.h index ff23592aec..23c34e39b5 100644 --- a/LibCarla/source/carla/client/BlueprintLibrary.h +++ b/LibCarla/source/carla/client/BlueprintLibrary.h @@ -22,8 +22,7 @@ namespace client { /// @todo Works as a list but its actually a map. We should assess the use /// cases and reconsider this implementation. class BlueprintLibrary - : public EnableSharedFromThis, - private NonCopyable { + : public EnableSharedFromThis { using map_type = std::unordered_map; public: @@ -37,8 +36,8 @@ namespace client { explicit BlueprintLibrary(const std::vector &blueprints); - //BlueprintLibrary(BlueprintLibrary &&) = default; - //BlueprintLibrary &operator=(BlueprintLibrary &&) = default; + BlueprintLibrary(BlueprintLibrary &&) = default; + BlueprintLibrary &operator=(BlueprintLibrary &&) = default; /// Filters a list of ActorBlueprint with id or tags matching /// @a wildcard_pattern.