Compile fixes for windows(?)

This commit is contained in:
Aleric Inglewood
2013-11-07 01:44:57 +01:00
parent 254396596c
commit ee1ca0ed99
4 changed files with 8 additions and 1 deletions

View File

@@ -45,8 +45,13 @@
// Throw arbitrary class.
#define THROW_ALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(), AIAlert::not_modal, __VA_ARGS__)
#define THROW_MALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(), AIAlert::modal, __VA_ARGS__)
#ifdef __GNUC__
#define THROW_FALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__PRETTY_FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::not_modal, __VA_ARGS__)
#define THROW_FMALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__PRETTY_FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::modal, __VA_ARGS__)
#else
#define THROW_FALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::not_modal, __VA_ARGS__)
#define THROW_FMALERT_CLASS(Alert, ...) throw Alert(AIAlert::Prefix(__FUNCTION__, AIAlert::pretty_function_prefix), AIAlert::modal, __VA_ARGS__)
#endif
// Shortcut to throw AIAlert::Error.
#define THROW_ALERT(...) THROW_ALERT_CLASS(AIAlert::Error, __VA_ARGS__)

View File

@@ -32,6 +32,7 @@
#include <typeinfo>
#include "string_table.h"
#include "llerror.h" // llassert_always
#include <boost/utility.hpp>
#include <boost/function.hpp>
#include <boost/bind.hpp>

View File

@@ -175,6 +175,7 @@ class AIXMLElementParser
protected:
// Used by AIXMLParser, which initializes mNode directly.
AIXMLElementParser(std::string const& filename, std::string const& file_desc, U32 version) : mVersion(version), mFilename(filename), mFileDesc(file_desc) { }
virtual ~AIXMLElementParser() { }
// Used for error reporting.
virtual std::string node_name(void) const { return "node '" + mNode->getName() + "'"; }

View File

@@ -46,7 +46,7 @@
// The reason for this clumsy way to link wearable to extra meta data is to stay
// compatible with the older format (no metaversion).
#include "sys.h"
#include "llviewerprecompiledheaders.h"
#include "aixmllindengenepool.h"
#include "hippogridmanager.h"
#include "llvisualparam.h"