summaryrefslogtreecommitdiffstats
path: root/Sluift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-01-18 18:33:52 (GMT)
committerSwift Review <review@swift.im>2014-02-13 10:56:56 (GMT)
commitba0a79a6fa68f2757795e96a22ff310ebe41a715 (patch)
tree905b4645ce2141c2b63dc574cb3a9ac751fe0e63 /Sluift
parentf44ea24fda0f08195180215a30bc626d7c1907c5 (diff)
downloadswift-contrib-ba0a79a6fa68f2757795e96a22ff310ebe41a715.zip
swift-contrib-ba0a79a6fa68f2757795e96a22ff310ebe41a715.tar.bz2
Fix clang warnings
Change-Id: I7cd26f00f626b64da934e9f5594db393d6184b9c
Diffstat (limited to 'Sluift')
-rw-r--r--Sluift/Lua/Exception.cpp2
-rw-r--r--Sluift/Lua/Exception.h6
-rw-r--r--Sluift/Response.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/Sluift/Lua/Exception.cpp b/Sluift/Lua/Exception.cpp
index d80b9fb..889c931 100644
--- a/Sluift/Lua/Exception.cpp
+++ b/Sluift/Lua/Exception.cpp
@@ -11,5 +11,5 @@ using namespace Swift::Lua;
Exception::Exception(const std::string& what) : std::runtime_error(what) {
}
-Exception::~Exception() throw() {
+Exception::~Exception() SWIFTEN_NOEXCEPT {
}
diff --git a/Sluift/Lua/Exception.h b/Sluift/Lua/Exception.h
index 6d00d01..a68b925 100644
--- a/Sluift/Lua/Exception.h
+++ b/Sluift/Lua/Exception.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Remko Tronçon
+ * Copyright (c) 2013-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -7,13 +7,15 @@
#pragma once
#include <stdexcept>
+#include <Swiften/Base/API.h>
namespace Swift {
namespace Lua {
class Exception : public std::runtime_error {
public:
Exception(const std::string& what);
- virtual ~Exception() throw();
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Exception)
+ virtual ~Exception() SWIFTEN_NOEXCEPT;
};
}
}
diff --git a/Sluift/Response.h b/Sluift/Response.h
index 1cd059a..b007897 100644
--- a/Sluift/Response.h
+++ b/Sluift/Response.h
@@ -8,6 +8,7 @@
#include <Swiften/Elements/Payload.h>
#include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Base/API.h>
struct lua_State;
@@ -15,6 +16,7 @@ namespace Swift {
namespace Sluift {
struct Response {
Response(boost::shared_ptr<Payload> result, boost::shared_ptr<ErrorPayload> error) : result(result), error(error) {}
+ SWIFTEN_DEFAULT_COPY_CONSTRUCTOR(Response)
~Response();
static Response withResult(boost::shared_ptr<Payload> response) {