diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 4b2f9dc4b..ef5b14b80 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -164,6 +164,11 @@ if (LINUX) add_definitions(-Wno-parentheses) endif (${CXX_VERSION} GREATER 429) + #gcc 4.6 has a new spammy warning + if(NOT ${CXX_VERSION} LESS 460) + add_definitions(-Wno-unused-but-set-variable) + endif (NOT ${CXX_VERSION} LESS 460) + # End of hacks. add_definitions( diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 48423934c..b7f28d365 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option } case LLSD::TypeUUID: + { ostr.put('u'); - ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES); + LLUUID d = data.asUUID(); + ostr.write((const char*)(&(d.mData)), UUID_BYTES); break; + } case LLSD::TypeString: ostr.put('s'); diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 13c062e38..52ee7e3bf 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -605,13 +605,13 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr } else if ("time" == keyword) { - S32 when; + S32 when = -1; LLStringUtil::convertToS32(value, when); entry->mTime = when; } else if ("flags" == keyword) { - U32 setting; + U32 setting = 0xFFFFFFFF; LLStringUtil::convertToU32(value, setting); entry->mFlags = setting; } diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h index 8864f7af1..7c03f2f69 100644 --- a/indra/llui/llfunctorregistry.h +++ b/indra/llui/llfunctorregistry.h @@ -75,7 +75,6 @@ public: bool registerFunctor(const std::string& name, ResponseFunctor f) { bool retval = true; - typename FunctorMap::iterator it = mMap.find(name); if (mMap.count(name) == 0) { mMap[name] = f; @@ -102,7 +101,6 @@ public: FUNCTOR_TYPE getFunctor(const std::string& name) { - typename FunctorMap::iterator it = mMap.find(name); if (mMap.count(name) != 0) { return mMap[name];