Fix issue a different way and supress new gcc 4.8 warning
This commit is contained in:
@@ -159,6 +159,11 @@ if (LINUX)
|
||||
add_definitions(-Wno-unused-but-set-variable)
|
||||
endif (NOT ${CXX_VERSION} LESS 460)
|
||||
|
||||
#gcc 4.8 boost spam wall
|
||||
if(NOT ${CXX_VERSION} LESS 480)
|
||||
add_definitions(-Wno-unused-local-typedefs)
|
||||
endif (NOT ${CXX_VERSION} LESS 480)
|
||||
|
||||
# End of hacks.
|
||||
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
|
||||
|
||||
@@ -473,11 +473,13 @@ const std::string LLTexLayerSet::getBodyRegionName() const
|
||||
// virtual
|
||||
void LLTexLayerSet::asLLSD(LLSD& sd) const
|
||||
{
|
||||
llassert_always(false); // broken function
|
||||
#if 0
|
||||
sd["visible"] = LLSD::Boolean(isVisible());
|
||||
LLSD layer_list_sd;
|
||||
layer_list_t::const_iterator layer_iter = mLayerList.begin();
|
||||
layer_list_t::const_iterator layer_end = mLayerList.end();
|
||||
for(; layer_iter != layer_end; ++layer_iter)
|
||||
for(; layer_iter != layer_end; ++layer_iter);
|
||||
{
|
||||
LLSD layer_sd;
|
||||
//LLTexLayerInterface* layer = (*layer_iter);
|
||||
@@ -492,6 +494,7 @@ void LLTexLayerSet::asLLSD(LLSD& sd) const
|
||||
sd["layers"] = layer_list_sd;
|
||||
sd["masks"] = mask_list_sd;
|
||||
sd["info"] = info_sd;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#ifdef LL_GNUC
|
||||
#if LL_GNUC
|
||||
// Generate code for inlines from llthread.h (needed for is_main_thread()).
|
||||
#pragma implementation "llthread.h"
|
||||
#endif
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#ifndef LL_LLTHREAD_H
|
||||
#define LL_LLTHREAD_H
|
||||
|
||||
#ifdef LL_GNUC
|
||||
#if LL_GNUC
|
||||
// Needed for is_main_thread() when compiling with optimization (relwithdebinfo).
|
||||
// It doesn't hurt to just always specify it though.
|
||||
#pragma interface
|
||||
|
||||
Reference in New Issue
Block a user