diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-02-09 16:13:57 -0800 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2023-02-09 16:13:57 -0800 |
| commit | a56385345f3fb261b8c2c375960f1328c296ebf2 (patch) | |
| tree | 69d64a092fac5cb98cdf14184282fa49a497336a /indra/llprimitive | |
| parent | d6841c07983a46ff805ed23a7318efbf9cca3b24 (diff) | |
SL-19080: Address clang-provided errors
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 2 | ||||
| -rw-r--r-- | indra/llprimitive/tests/llgltfmaterial_test.cpp | 2 |
3 files changed, 2 insertions, 4 deletions
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" |