From a56385345f3fb261b8c2c375960f1328c296ebf2 Mon Sep 17 00:00:00 2001
From: Cosmic Linden <cosmic@lindenlab.com>
Date: Thu, 9 Feb 2023 16:13:57 -0800
Subject: SL-19080: Address clang-provided errors
---
indra/llprimitive/llgltfmaterial.cpp | 2 +-
indra/llprimitive/llgltfmaterial.h | 2 +-
indra/llprimitive/tests/llgltfmaterial_test.cpp | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
(limited to 'indra')
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index 2e920aa44e..291e2c2bf5 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -33,7 +33,7 @@
const char* LLGLTFMaterial::ASSET_VERSION = "1.1";
const char* LLGLTFMaterial::ASSET_TYPE = "GLTF 2.0";
-const std::array<char*, 2> LLGLTFMaterial::ACCEPTED_ASSET_VERSIONS = { "1.0", "1.1" };
+const std::array<std::string, 2> LLGLTFMaterial::ACCEPTED_ASSET_VERSIONS = { "1.0", "1.1" };
const char* GLTF_FILE_EXTENSION_TRANSFORM = "KHR_texture_transform";
const char* GLTF_FILE_EXTENSION_TRANSFORM_SCALE = "scale";
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index fd26e7563c..89c7f75c44 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -51,7 +51,7 @@ public:
static const char* ASSET_VERSION;
static const char* ASSET_TYPE;
- static const std::array<char*, 2> ACCEPTED_ASSET_VERSIONS;
+ static const std::array<std::string, 2> ACCEPTED_ASSET_VERSIONS;
static bool isAcceptedVersion(const std::string& version) { return std::find(ACCEPTED_ASSET_VERSIONS.cbegin(), ACCEPTED_ASSET_VERSIONS.cend(), version) != ACCEPTED_ASSET_VERSIONS.cend(); }
struct TextureTransform
diff --git a/indra/llprimitive/tests/llgltfmaterial_test.cpp b/indra/llprimitive/tests/llgltfmaterial_test.cpp
index 4f58f4e567..5ef88c8119 100644
--- a/indra/llprimitive/tests/llgltfmaterial_test.cpp
+++ b/indra/llprimitive/tests/llgltfmaterial_test.cpp
@@ -23,8 +23,6 @@
* $/LicenseInfo$
*/
-#pragma once
-
#include "linden_common.h"
#include "lltut.h"
--
cgit v1.2.3