summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-09-16 20:05:21 +0000
committerrubidium <rubidium@openttd.org>2014-09-16 20:05:21 +0000
commitff880a420ded98cd0786bbc8a4ce01434b5e88ea (patch)
tree48301c910d0ce538aece370a150a4e7ba70f0950
parent659d5147958bf3c4a008113a4bd127c7836db818 (diff)
downloadopenttd-ff880a420ded98cd0786bbc8a4ce01434b5e88ea.tar.xz
(svn r26831) -Fix [Squirrel]: (bogus) warning about falling through in a switch
-rw-r--r--src/3rdparty/squirrel/squirrel/sqcompiler.cpp2
-rw-r--r--src/3rdparty/squirrel/squirrel/sqcompiler.h2
-rw-r--r--src/3rdparty/squirrel/squirrel/sqlexer.cpp2
-rw-r--r--src/3rdparty/squirrel/squirrel/sqlexer.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
index 596bf9622..53775e183 100644
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp
@@ -68,7 +68,7 @@ public:
SQCompiler *c = (SQCompiler *)ud;
c->Error(s);
}
- void Error(const SQChar *s, ...)
+ NORETURN void Error(const SQChar *s, ...)
{
static SQChar temp[256];
va_list vl;
diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.h b/src/3rdparty/squirrel/squirrel/sqcompiler.h
index dd55888b6..e384b3b0a 100644
--- a/src/3rdparty/squirrel/squirrel/sqcompiler.h
+++ b/src/3rdparty/squirrel/squirrel/sqcompiler.h
@@ -72,6 +72,6 @@ struct SQVM;
#define TK_CONST 324
-typedef void(*CompilerErrorFunc)(void *ud, const SQChar *s);
+typedef NORETURN void(*CompilerErrorFunc)(void *ud, const SQChar *s);
bool Compile(SQVM *vm, SQLEXREADFUNC rg, SQUserPointer up, const SQChar *sourcename, SQObjectPtr &out, bool raiseerror, bool lineinfo);
#endif //_SQCOMPILER_H_
diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.cpp b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
index 902427bbf..9bd0966e8 100644
--- a/src/3rdparty/squirrel/squirrel/sqlexer.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.cpp
@@ -89,7 +89,7 @@ void SQLexer::Init(SQSharedState *ss, SQLEXREADFUNC rg, SQUserPointer up,Compile
Next();
}
-void SQLexer::Error(const SQChar *err)
+NORETURN void SQLexer::Error(const SQChar *err)
{
_errfunc(_errtarget,err);
}
diff --git a/src/3rdparty/squirrel/squirrel/sqlexer.h b/src/3rdparty/squirrel/squirrel/sqlexer.h
index 5600b5f0e..878748b9e 100644
--- a/src/3rdparty/squirrel/squirrel/sqlexer.h
+++ b/src/3rdparty/squirrel/squirrel/sqlexer.h
@@ -7,7 +7,7 @@ struct SQLexer
SQLexer();
~SQLexer();
void Init(SQSharedState *ss,SQLEXREADFUNC rg,SQUserPointer up,CompilerErrorFunc efunc,void *ed);
- void Error(const SQChar *err);
+ NORETURN void Error(const SQChar *err);
SQInteger Lex();
const SQChar *Tok2Str(SQInteger tok);
private: