From bdc12cbe64ac373e9512ef5d59654002405770bd Mon Sep 17 00:00:00 2001 From: nsubiron Date: Mon, 29 Apr 2019 18:37:42 +0200 Subject: [PATCH] Remove nodiscard attribute as is not yet available in C++14 --- LibCarla/source/carla/geom/Vector2D.h | 4 ++-- LibCarla/source/carla/geom/Vector3D.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LibCarla/source/carla/geom/Vector2D.h b/LibCarla/source/carla/geom/Vector2D.h index 7b3bc193c..f40f67d46 100644 --- a/LibCarla/source/carla/geom/Vector2D.h +++ b/LibCarla/source/carla/geom/Vector2D.h @@ -131,12 +131,12 @@ namespace geom { #ifdef LIBCARLA_INCLUDED_FROM_UE4 /// Return a Vector2D converted from centimeters to meters. - [[ nodiscard ]] Vector2D ToMeters() const { + Vector2D ToMeters() const { return *this * 1e-2f; } /// Return a Vector2D converted from meters to centimeters. - [[ nodiscard ]] Vector2D ToCentimeters() const { + Vector2D ToCentimeters() const { return *this * 1e2f; } diff --git a/LibCarla/source/carla/geom/Vector3D.h b/LibCarla/source/carla/geom/Vector3D.h index de51763fb..6f1606619 100644 --- a/LibCarla/source/carla/geom/Vector3D.h +++ b/LibCarla/source/carla/geom/Vector3D.h @@ -138,12 +138,12 @@ namespace geom { #ifdef LIBCARLA_INCLUDED_FROM_UE4 /// Return a Vector3D converted from centimeters to meters. - [[ nodiscard ]] Vector3D ToMeters() const { + Vector3D ToMeters() const { return *this * 1e-2f; } /// Return a Vector3D converted from meters to centimeters. - [[ nodiscard ]] Vector3D ToCentimeters() const { + Vector3D ToCentimeters() const { return *this * 1e2f; }