From 09aa54246f607bc1770a7cc2dc076185487a00f7 Mon Sep 17 00:00:00 2001
From: James Price <jrprice@google.com>
Date: Wed, 20 May 2020 15:16:18 -0400
Subject: [PATCH] Fix warnings in basic suite (#782)

* Fix "ignored typedef" warning

* Fix "returning reference to temporary" warning
---
 test_conformance/basic/test_progvar.cpp             | 11 ++++++-----
 test_conformance/basic/test_work_item_functions.cpp |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test_conformance/basic/test_progvar.cpp b/test_conformance/basic/test_progvar.cpp
index 6a0344f7..9062a54c 100644
--- a/test_conformance/basic/test_progvar.cpp
+++ b/test_conformance/basic/test_progvar.cpp
@@ -37,6 +37,7 @@
 // TODO: pointer-to-half (and its vectors)
 // TODO: union of...
 
+#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -595,11 +596,11 @@ static int l_build_type_table(cl_device_id device)
 
 static const TypeInfo& l_find_type( const char* name )
 {
-    for ( size_t i = 0; i < num_type_info ; i++ ) {
-        if ( 0 == strcmp( name, type_info[i].get_name_c_str() ) ) return type_info[i];
-    }
-    assert(0);
-    return TypeInfo();
+    auto itr =
+        std::find_if(type_info, type_info + num_type_info,
+                     [name](TypeInfo& ti) { return ti.get_name() == name; });
+    assert(itr != type_info + num_type_info);
+    return *itr;
 }
 
 
diff --git a/test_conformance/basic/test_work_item_functions.cpp b/test_conformance/basic/test_work_item_functions.cpp
index 48cb443c..890f3c2d 100644
--- a/test_conformance/basic/test_work_item_functions.cpp
+++ b/test_conformance/basic/test_work_item_functions.cpp
@@ -26,7 +26,7 @@
 #include "harness/conversions.h"
 #include "harness/typeWrappers.h"
 
-typedef struct work_item_data
+struct work_item_data
 {
     cl_uint workDim;
     cl_uint globalSize[ 3 ];