3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Fixed error compilations on windows.

Browse Source
This commit is contained in:
Matias Fontanini
2014-07-02 19:02:48 -03:00
parent dd2ed5daa4
commit 22e7c1d7c4
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/cxxstd.h
View File

@@ -38,7 +38,9 @@
#define TINS_CXXSTD_GCC_FIX 0
#endif // __GXX_EXPERIMENTAL_CXX0X__
#define TINS_IS_CXX11 (__cplusplus > 199711L || TINS_CXXSTD_GCC_FIX == 1)
#ifndef TINS_IS_CXX11
#define TINS_IS_CXX11 (__cplusplus > 199711L || TINS_CXXSTD_GCC_FIX == 1 || _MSC_VER >= 1800)
#endif // TINS_IS_CXX11
namespace Tins{
namespace Internals {

2
include/macros.h
View File

@@ -40,11 +40,13 @@
#define TINS_END_PACK __pragma( pack(pop) )
#define TINS_PACKED(DECLARATION) __pragma( pack(push, 1) ) DECLARATION __pragma( pack(pop) )
#define TINS_DEPRECATED(func) __declspec(deprecated) func
#define NOEXCEPT
#else
#define TINS_BEGIN_PACK
#define TINS_END_PACK __attribute__((packed))
#define TINS_PACKED(DECLARATION) DECLARATION __attribute__((packed))
#define TINS_DEPRECATED(func) func __attribute__ ((deprecated))
#define NOEXCEPT noexcept
#endif
#endif

4
include/packet.h
View File

@@ -197,14 +197,14 @@ public:
/**
* Move constructor.
*/
Packet(Packet &&rhs) noexcept : pdu_(rhs.pdu()), ts(rhs.timestamp()) {
Packet(Packet &&rhs) NOEXCEPT : pdu_(rhs.pdu()), ts(rhs.timestamp()) {
rhs.pdu_ = nullptr;
}
/**
* Move assignment operator.
*/
Packet& operator=(Packet &&rhs) noexcept {
Packet& operator=(Packet &&rhs) NOEXCEPT {
if(this != &rhs) {
std::swap(pdu_, rhs.pdu_);
ts = rhs.timestamp();

4
include/packet_sender.h
View File

@@ -87,7 +87,7 @@ namespace Tins {
* \brief Move constructor.
* \param rhs The sender to be moved.
*/
PacketSender(PacketSender &&rhs) noexcept {
PacketSender(PacketSender &&rhs) NOEXCEPT {
*this = std::move(rhs);
}
@@ -95,7 +95,7 @@ namespace Tins {
* \brief Move assignment operator.
* \param rhs The sender to be moved.
*/
PacketSender& operator=(PacketSender &&rhs) noexcept {
PacketSender& operator=(PacketSender &&rhs) NOEXCEPT {
_sockets = std::move(rhs._sockets);
rhs._sockets = std::vector<int>(SOCKETS_END, INVALID_RAW_SOCKET);
#ifndef WIN32

4
include/packet_writer.h
View File

@@ -76,7 +76,7 @@ public:
*
* \param rhs The PacketWriter to be moved.
*/
PacketWriter(PacketWriter &&rhs) noexcept {
PacketWriter(PacketWriter &&rhs) NOEXCEPT {
*this = std::move(rhs);
}
@@ -88,7 +88,7 @@ public:
*
* \param rhs The PacketWriter to be moved.
*/
PacketWriter& operator=(PacketWriter &&rhs) noexcept {
PacketWriter& operator=(PacketWriter &&rhs) NOEXCEPT {
handle = 0;
dumper = 0;
std::swap(handle, rhs.handle);

4
include/pdu.h
View File

@@ -149,7 +149,7 @@ namespace Tins {
*
* \param rhs The PDU to be moved.
*/
PDU(PDU &&rhs) noexcept
PDU(PDU &&rhs) NOEXCEPT
: _inner_pdu(0)
{
std::swap(_inner_pdu, rhs._inner_pdu);
@@ -160,7 +160,7 @@ namespace Tins {
*
* \param rhs The PDU to be moved.
*/
PDU& operator=(PDU &&rhs) noexcept {
PDU& operator=(PDU &&rhs) NOEXCEPT {
std::swap(_inner_pdu, rhs._inner_pdu);
return *this;
}

4
include/sniffer.h
View File

@@ -68,7 +68,7 @@ namespace Tins {
* \brief Move constructor.
* This constructor is available only in C++11.
*/
BaseSniffer(BaseSniffer &&rhs) noexcept
BaseSniffer(BaseSniffer &&rhs) NOEXCEPT
: handle(nullptr), mask()
{
*this = std::move(rhs);
@@ -78,7 +78,7 @@ namespace Tins {
* \brief Move assignment operator.
* This operator is available only in C++11.
*/
BaseSniffer& operator=(BaseSniffer &&rhs) noexcept
BaseSniffer& operator=(BaseSniffer &&rhs) NOEXCEPT
{
using std::swap;
swap(handle, rhs.handle);