From d752550cc8d01b29dd8b58e688147acff10da33c Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 15:49:33 -0700 Subject: Update to build on Xcode 6.0: delete called on 'LLTranslationBridge' that is abstract but has non-virtual destructor [-Werror,-Wdelete-non-virtual-dtor] --- indra/llappearance/llwearabletype.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/llappearance') diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h index e51e6731d3..7c9594644d 100644 --- a/indra/llappearance/llwearabletype.h +++ b/indra/llappearance/llwearabletype.h @@ -35,6 +35,9 @@ class LLTranslationBridge { public: + // clang needs this to be happy + virtual ~LLTranslationBridge() {} + virtual std::string getString(const std::string &xml_desc) = 0; }; -- cgit v1.2.3 From 2a3f022e0ac018345e80da34d4ea6965e5c31de0 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 17 Oct 2014 15:58:28 -0700 Subject: Update to build on Xcode 6.0: clang detecting unsigned int (size_t) comparison with <0 [-Wtautological-compare] --- indra/llappearance/llwearabledata.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llappearance') diff --git a/indra/llappearance/llwearabledata.cpp b/indra/llappearance/llwearabledata.cpp index cf1ee435a8..5dfb201fc4 100755 --- a/indra/llappearance/llwearabledata.cpp +++ b/indra/llappearance/llwearabledata.cpp @@ -173,8 +173,9 @@ bool LLWearableData::swapWearables(const LLWearableType::EType type, U32 index_a } wearableentry_vec_t& wearable_vec = wearable_iter->second; - if (0 > index_a || index_a >= wearable_vec.size()) return false; - if (0 > index_b || index_b >= wearable_vec.size()) return false; + // removed 0 > index_a and index_b comparisions - can never be true + if (index_a >= wearable_vec.size()) return false; + if (index_b >= wearable_vec.size()) return false; LLWearable* wearable = wearable_vec[index_a]; wearable_vec[index_a] = wearable_vec[index_b]; -- cgit v1.2.3 From 42cb9e655a3ada775ff9f432bb23afd47aa6a3ad Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Oct 2014 11:18:30 -0700 Subject: Update to build on Xcode 6.0: delete called on that is abstract but has non-virtual dest --- indra/llappearance/lltexturemanagerbridge.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llappearance') diff --git a/indra/llappearance/lltexturemanagerbridge.h b/indra/llappearance/lltexturemanagerbridge.h index 4b814b522d..101704b162 100644 --- a/indra/llappearance/lltexturemanagerbridge.h +++ b/indra/llappearance/lltexturemanagerbridge.h @@ -35,6 +35,8 @@ class LLTextureManagerBridge { public: + virtual ~LLTextureManagerBridge() {} + virtual LLPointer getLocalTexture(BOOL usemipmaps = TRUE, BOOL generate_gl_tex = TRUE) = 0; virtual LLPointer getLocalTexture(const U32 width, const U32 height, const U8 components, BOOL usemipmaps, BOOL generate_gl_tex = TRUE) = 0; virtual LLGLTexture* getFetchedTexture(const LLUUID &image_id) = 0; -- cgit v1.2.3 From 1a974f227de5f3d6c42dd5b836acab8edd28171c Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Oct 2014 11:21:54 -0700 Subject: Update to build on Xcode 6.0: typedef declared protected incorrectly here --- indra/llappearance/llwearable.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llappearance') diff --git a/indra/llappearance/llwearable.h b/indra/llappearance/llwearable.h index 406fc7e883..630eb1e3a5 100755 --- a/indra/llappearance/llwearable.h +++ b/indra/llappearance/llwearable.h @@ -113,6 +113,9 @@ public: // Update the baked texture hash. virtual void addToBakedTextureHash(LLMD5& hash) const = 0; + typedef std::map visual_param_index_map_t; + visual_param_index_map_t mVisualParamIndexMap; + protected: typedef std::map te_map_t; void syncImages(te_map_t &src, te_map_t &dst); @@ -132,9 +135,6 @@ protected: typedef std::map param_map_t; param_map_t mSavedVisualParamMap; // last saved version of visual params - typedef std::map visual_param_index_map_t; - visual_param_index_map_t mVisualParamIndexMap; - te_map_t mTEMap; // maps TE to LocalTextureObject te_map_t mSavedTEMap; // last saved version of TEMap }; -- cgit v1.2.3