From 22e7c1d7c4cc2a73e5067adf306371d79b3fb21f Mon Sep 17 00:00:00 2001
From: Matias Fontanini <matias.fontanini@gmail.com>
Date: Wed, 2 Jul 2014 19:02:48 -0300
Subject: [PATCH] Fixed error compilations on windows.

---
 include/cxxstd.h        | 4 +++-
 include/macros.h        | 2 ++
 include/packet.h        | 4 ++--
 include/packet_sender.h | 4 ++--
 include/packet_writer.h | 4 ++--
 include/pdu.h           | 4 ++--
 include/sniffer.h       | 4 ++--
 src/eapol.cpp           | 2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/include/cxxstd.h b/include/cxxstd.h
index c7bcce0..cdef52e 100644
--- a/include/cxxstd.h
+++ b/include/cxxstd.h
@@ -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 {
diff --git a/include/macros.h b/include/macros.h
index 368baee..e57048c 100644
--- a/include/macros.h
+++ b/include/macros.h
@@ -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
diff --git a/include/packet.h b/include/packet.h
index 56c0506..17496ed 100644
--- a/include/packet.h
+++ b/include/packet.h
@@ -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();
diff --git a/include/packet_sender.h b/include/packet_sender.h
index 01feabf..3588406 100644
--- a/include/packet_sender.h
+++ b/include/packet_sender.h
@@ -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
diff --git a/include/packet_writer.h b/include/packet_writer.h
index 251259b..e7a65f8 100644
--- a/include/packet_writer.h
+++ b/include/packet_writer.h
@@ -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);
diff --git a/include/pdu.h b/include/pdu.h
index 358d0ee..792c4c6 100644
--- a/include/pdu.h
+++ b/include/pdu.h
@@ -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;
             }
diff --git a/include/sniffer.h b/include/sniffer.h
index d1d1db2..7156ed4 100644
--- a/include/sniffer.h
+++ b/include/sniffer.h
@@ -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);
diff --git a/src/eapol.cpp b/src/eapol.cpp
index 9be8182..e7d5047 100644
--- a/src/eapol.cpp
+++ b/src/eapol.cpp
@@ -32,7 +32,7 @@
 #include <cassert>
 #endif
 #include <stdexcept>
- #include <iostream> // borrame
+#include <algorithm>
 #include "eapol.h"
 #include "rsn_information.h"
 #include "exceptions.h"