Update to build on Xcode 6.0: Change tactic about turning off warnings about -Wdelete-incomplete in anywhere lluictrlfactory.h is used - richard okay'd
parent
86f49bec1b
commit
4e55456d8b
|
|
@ -28,7 +28,16 @@
|
|||
|
||||
#include "llrngwriter.h"
|
||||
#include "lluicolor.h"
|
||||
|
||||
#if LL_DARWIN
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdelete-incomplete"
|
||||
#include "lluictrlfactory.h"
|
||||
#pragma clang diagnostic pop
|
||||
#elif
|
||||
#include "lluictrlfactory.h"
|
||||
#endif
|
||||
|
||||
#include "boost/bind.hpp"
|
||||
|
||||
static LLInitParam::Parser::parser_read_func_map_t sReadFuncs;
|
||||
|
|
|
|||
|
|
@ -183,7 +183,15 @@ public:
|
|||
if (!widget)
|
||||
{
|
||||
LL_WARNS() << "Widget in " << filename << " was of type " << typeid(view).name() << " instead of expected type " << typeid(T).name() << LL_ENDL;
|
||||
|
||||
#if LL_DARWIN
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdelete-incomplete"
|
||||
delete view;
|
||||
#pragma clang diagnostic pop
|
||||
#elif
|
||||
delete view;
|
||||
#endif
|
||||
view = NULL;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,16 +44,7 @@
|
|||
#include "llviewquery.h"
|
||||
#include "lluistring.h"
|
||||
#include "llcursortypes.h"
|
||||
|
||||
#if LL_DARWIN
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wdelete-incomplete"
|
||||
#include "lluictrlfactory.h"
|
||||
#pragma clang diagnostic pop
|
||||
#elif
|
||||
#include "lluictrlfactory.h"
|
||||
#endif
|
||||
|
||||
#include "lltreeiterators.h"
|
||||
#include "llfocusmgr.h"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue