From b3313c27f3703cd714b472ca8c44cbcd7ab9b6c5 Mon Sep 17 00:00:00 2001
From: Nate Koenig <nkoenig@users.noreply.github.com>
Date: Tue, 18 Oct 2022 10:43:27 -0700
Subject: [PATCH] Fix arm builds (#462)

* Fix arm builds

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Adding in pre-release 5.2.1

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Signed-off-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Nate Koenig <nate@openrobotics.org>
---
 CMakeLists.txt       | 4 ++--
 io/src/CSVStreams.cc | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a7a34f1c..b41e559ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-common5 VERSION 5.2.0)
+project(gz-common5 VERSION 5.2.1)
 set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
 
 #============================================================================
@@ -18,7 +18,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(VERSION_SUFFIX)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #============================================================================
 # Set project-specific options
diff --git a/io/src/CSVStreams.cc b/io/src/CSVStreams.cc
index a286e14ca..f561edba3 100644
--- a/io/src/CSVStreams.cc
+++ b/io/src/CSVStreams.cc
@@ -43,7 +43,7 @@ std::istream &ExtractCSVToken(
   char character;
   if (_stream.peek(), !_stream.fail() && _stream.eof())
   {
-    _token = {CSVToken::TERMINATOR, EOF};
+    _token = {CSVToken::TERMINATOR, static_cast<char>(EOF)};
   }
   else if (_stream.get(character))
   {
@@ -121,7 +121,8 @@ std::istream &ParseCSVRow(
             state = FIELD_START;
             break;
           case CSVToken::TERMINATOR:
-            if (token.character != EOF || !_row.empty() || text.tellp() > 0)
+            if (token.character != static_cast<char>(EOF) || !_row.empty() ||
+                text.tellp() > 0)
             {
               _row.push_back(text.str());
               state = RECORD_END;
@@ -140,7 +141,8 @@ std::istream &ParseCSVRow(
           state = FIELD_END;
           break;
         }
-        if (token.type != CSVToken::TERMINATOR || token.character != EOF)
+        if (token.type != CSVToken::TERMINATOR ||
+            token.character != static_cast<char>(EOF))
         {
           text << token.character;
           break;