From b634e6a443fbf31283cab2f3b1febe65e68af504 Mon Sep 17 00:00:00 2001
From: Paul Hollinsky <phollinsky@intrepidcs.com>
Date: Mon, 24 Sep 2018 18:16:08 -0400
Subject: [PATCH 1/2] Point macOS version towards the right dylib

This is super temporary

Eventually we'll decide where the library will go
---
 platform/posix/darwin/include/dynamiclib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/posix/darwin/include/dynamiclib.h b/platform/posix/darwin/include/dynamiclib.h
index 27756df..9441da3 100644
--- a/platform/posix/darwin/include/dynamiclib.h
+++ b/platform/posix/darwin/include/dynamiclib.h
@@ -1,6 +1,6 @@
 #ifndef __DYNAMICLIB_DARWIN_H_
 #define __DYNAMICLIB_DARWIN_H_
 
-#define icsneoDynamicLibraryLoad() dlopen("/home/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
+#define icsneoDynamicLibraryLoad() dlopen("/Users/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
 
 #endif
\ No newline at end of file

From 2099ba9d1e8258f2bff1560b22ade90cd9ac9535 Mon Sep 17 00:00:00 2001
From: Paul Hollinsky <phollinsky@intrepidcs.com>
Date: Mon, 24 Sep 2018 19:04:20 -0400
Subject: [PATCH 2/2] Resolve macOS warnings and standardize style

---
 api/icsneocpp/include/icsneocpp.h                 | 6 ++++--
 communication/communication.cpp                   | 2 +-
 communication/include/communication.h             | 2 +-
 communication/include/icommunication.h            | 2 +-
 communication/include/messagecallback.h           | 2 +-
 communication/include/messagefilter.h             | 2 +-
 communication/include/multichannelcommunication.h | 2 +-
 communication/include/network.h                   | 2 +-
 communication/message/include/canmessage.h        | 2 +-
 communication/message/include/message.h           | 2 +-
 communication/message/include/neomessage.h        | 6 ++++--
 communication/multichannelcommunication.cpp       | 2 +-
 communication/packetizer.cpp                      | 2 +-
 device/include/device.h                           | 2 +-
 device/include/devicefinder.h                     | 2 +-
 device/include/neodevice.h                        | 6 ++++--
 device/neoobd2pro/include/neoobd2pro.h            | 2 +-
 device/neoobd2sim/include/neoobd2sim.h            | 2 +-
 device/neovifire/include/neovifire.h              | 2 +-
 device/neovifire2/include/neovifire2.h            | 2 +-
 device/neovifire2/include/neovifire2eth.h         | 2 +-
 device/neovifire2/include/neovifire2usb.h         | 2 +-
 device/plasion/include/neoviion.h                 | 2 +-
 device/plasion/include/neoviplasma.h              | 2 +-
 device/plasion/include/plasion.h                  | 2 +-
 device/radgalaxy/include/radgalaxy.h              | 2 +-
 device/radstar2/include/radstar2.h                | 2 +-
 device/radsupermoon/include/radsupermoon.h        | 2 +-
 device/valuecan3/include/valuecan3.h              | 2 +-
 device/valuecan4/include/valuecan4.h              | 2 +-
 device/vividcan/include/vividcan.h                | 2 +-
 platform/posix/include/ftdi.h                     | 2 +-
 platform/posix/include/stm32.h                    | 2 +-
 platform/posix/stm32.cpp                          | 4 ++--
 platform/windows/include/ftdi.h                   | 2 +-
 platform/windows/include/pcap.h                   | 2 +-
 platform/windows/include/registry.h               | 2 +-
 platform/windows/include/stm32.h                  | 2 +-
 platform/windows/include/vcp.h                    | 2 +-
 platform/windows/internal/include/pcapdll.h       | 2 +-
 40 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/api/icsneocpp/include/icsneocpp.h b/api/icsneocpp/include/icsneocpp.h
index 3755dbf..54f985a 100644
--- a/api/icsneocpp/include/icsneocpp.h
+++ b/api/icsneocpp/include/icsneocpp.h
@@ -7,7 +7,9 @@
 #include "device/include/device.h"
 
 namespace icsneo {
-	std::vector<std::shared_ptr<Device>> FindAllDevices();
-};
+
+std::vector<std::shared_ptr<Device>> FindAllDevices();
+
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/communication.cpp b/communication/communication.cpp
index 5e0392c..84ca18d 100644
--- a/communication/communication.cpp
+++ b/communication/communication.cpp
@@ -13,7 +13,7 @@ int Communication::messageCallbackIDCounter = 1;
 
 uint8_t Communication::ICSChecksum(const std::vector<uint8_t>& data) {
 	uint32_t checksum = 0;
-	for(auto i = 0; i < data.size(); i++)
+	for(size_t i = 0; i < data.size(); i++)
 		checksum += data[i];
 	checksum = ~checksum;
 	checksum++;
diff --git a/communication/include/communication.h b/communication/include/communication.h
index 92b5fad..8f746cb 100644
--- a/communication/include/communication.h
+++ b/communication/include/communication.h
@@ -60,6 +60,6 @@ private:
 	void readTask();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/include/icommunication.h b/communication/include/icommunication.h
index 5b1c06b..784f72b 100644
--- a/communication/include/icommunication.h
+++ b/communication/include/icommunication.h
@@ -38,6 +38,6 @@ protected:
 	std::atomic<bool> closing{false};
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/include/messagecallback.h b/communication/include/messagecallback.h
index 20ce11c..6fa26ad 100644
--- a/communication/include/messagecallback.h
+++ b/communication/include/messagecallback.h
@@ -41,6 +41,6 @@ public:
 	CANMessageCallback(CANMessageFilter f, fn_messageCallback cb) : MessageCallback(cb, std::make_shared<CANMessageFilter>(f)) {}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/include/messagefilter.h b/communication/include/messagefilter.h
index 10be675..b5968da 100644
--- a/communication/include/messagefilter.h
+++ b/communication/include/messagefilter.h
@@ -67,6 +67,6 @@ private:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/include/multichannelcommunication.h b/communication/include/multichannelcommunication.h
index 43d915b..b4ea73a 100644
--- a/communication/include/multichannelcommunication.h
+++ b/communication/include/multichannelcommunication.h
@@ -97,6 +97,6 @@ private:
 	void readTask();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/include/network.h b/communication/include/network.h
index 059fa01..679ed33 100644
--- a/communication/include/network.h
+++ b/communication/include/network.h
@@ -335,6 +335,6 @@ private:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/message/include/canmessage.h b/communication/message/include/canmessage.h
index 35aa877..2d25ca3 100644
--- a/communication/message/include/canmessage.h
+++ b/communication/message/include/canmessage.h
@@ -10,6 +10,6 @@ public:
 	uint32_t arbid;
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/message/include/message.h b/communication/message/include/message.h
index 39ca828..096064a 100644
--- a/communication/message/include/message.h
+++ b/communication/message/include/message.h
@@ -14,6 +14,6 @@ public:
 	uint64_t timestamp;
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/communication/message/include/neomessage.h b/communication/message/include/neomessage.h
index 942d5db..bb31d18 100644
--- a/communication/message/include/neomessage.h
+++ b/communication/message/include/neomessage.h
@@ -33,8 +33,10 @@ typedef struct {
 #include "communication/message/include/message.h"
 
 namespace icsneo {
-	neomessage_t CreateNeoMessage(const Message& message);
-};
+
+neomessage_t CreateNeoMessage(const Message& message);
+
+}
 #endif
 
 #endif
\ No newline at end of file
diff --git a/communication/multichannelcommunication.cpp b/communication/multichannelcommunication.cpp
index d7a187b..24fa45b 100644
--- a/communication/multichannelcommunication.cpp
+++ b/communication/multichannelcommunication.cpp
@@ -97,7 +97,7 @@ void MultiChannelCommunication::readTask() {
 						continue;
 					}
 
-					for(auto i = 0; i < currentReadIndex; i++)
+					for(size_t i = 0; i < currentReadIndex; i++)
 						usbReadFifo.pop_front();
 
 					payloadBytes.clear();
diff --git a/communication/packetizer.cpp b/communication/packetizer.cpp
index 19ec1e9..b017c92 100644
--- a/communication/packetizer.cpp
+++ b/communication/packetizer.cpp
@@ -68,7 +68,7 @@ bool Packetizer::input(const std::vector<uint8_t>& inputBytes) {
 				break;
 			case ReadState::GetData:
 				// We do not include the checksum in packetLength so it doesn't get copied into the payload buffer
-				if(bytes.size() < packetLength + (checksum ? 1 : 0)) { // Read until we have the rest of the packet
+				if(bytes.size() < (size_t)(packetLength + (checksum ? 1 : 0))) { // Read until we have the rest of the packet
 					haveEnoughData = false;
 					break;
 				}
diff --git a/device/include/device.h b/device/include/device.h
index 890fa63..98c662a 100644
--- a/device/include/device.h
+++ b/device/include/device.h
@@ -71,6 +71,6 @@ private:
 	void enforcePollingMessageLimit();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/include/devicefinder.h b/device/include/devicefinder.h
index 0bfeb34..c98cf9c 100644
--- a/device/include/devicefinder.h
+++ b/device/include/devicefinder.h
@@ -12,6 +12,6 @@ public:
 	static std::vector<std::shared_ptr<Device>> FindAll();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/include/neodevice.h b/device/include/neodevice.h
index bca52f7..2e996b6 100644
--- a/device/include/neodevice.h
+++ b/device/include/neodevice.h
@@ -6,8 +6,10 @@
 #ifdef __cplusplus
 // A forward declaration is needed as there is a circular dependency
 namespace icsneo {
-	class Device;
-};
+
+class Device;
+
+}
 typedef icsneo::Device* devicehandle_t;
 #else
 typedef void* devicehandle_t;
diff --git a/device/neoobd2pro/include/neoobd2pro.h b/device/neoobd2pro/include/neoobd2pro.h
index 4ada734..97736f4 100644
--- a/device/neoobd2pro/include/neoobd2pro.h
+++ b/device/neoobd2pro/include/neoobd2pro.h
@@ -27,6 +27,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/neoobd2sim/include/neoobd2sim.h b/device/neoobd2sim/include/neoobd2sim.h
index 46cbddf..8f83c3a 100644
--- a/device/neoobd2sim/include/neoobd2sim.h
+++ b/device/neoobd2sim/include/neoobd2sim.h
@@ -27,6 +27,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/neovifire/include/neovifire.h b/device/neovifire/include/neovifire.h
index 5a40402..860d4a5 100644
--- a/device/neovifire/include/neovifire.h
+++ b/device/neovifire/include/neovifire.h
@@ -50,6 +50,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/neovifire2/include/neovifire2.h b/device/neovifire2/include/neovifire2.h
index 2292b1b..6fa1b40 100644
--- a/device/neovifire2/include/neovifire2.h
+++ b/device/neovifire2/include/neovifire2.h
@@ -14,6 +14,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/neovifire2/include/neovifire2eth.h b/device/neovifire2/include/neovifire2eth.h
index b000d96..707becb 100644
--- a/device/neovifire2/include/neovifire2eth.h
+++ b/device/neovifire2/include/neovifire2eth.h
@@ -24,6 +24,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/neovifire2/include/neovifire2usb.h b/device/neovifire2/include/neovifire2usb.h
index 0f8e9a3..ea2df15 100644
--- a/device/neovifire2/include/neovifire2usb.h
+++ b/device/neovifire2/include/neovifire2usb.h
@@ -24,6 +24,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/plasion/include/neoviion.h b/device/plasion/include/neoviion.h
index 12275df..309bc8d 100644
--- a/device/plasion/include/neoviion.h
+++ b/device/plasion/include/neoviion.h
@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/plasion/include/neoviplasma.h b/device/plasion/include/neoviplasma.h
index 84520af..e216f4e 100644
--- a/device/plasion/include/neoviplasma.h
+++ b/device/plasion/include/neoviplasma.h
@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/plasion/include/plasion.h b/device/plasion/include/plasion.h
index 9fc3ad0..fa1cb3c 100644
--- a/device/plasion/include/plasion.h
+++ b/device/plasion/include/plasion.h
@@ -14,6 +14,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/radgalaxy/include/radgalaxy.h b/device/radgalaxy/include/radgalaxy.h
index d9e99ce..315adf2 100644
--- a/device/radgalaxy/include/radgalaxy.h
+++ b/device/radgalaxy/include/radgalaxy.h
@@ -27,6 +27,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/radstar2/include/radstar2.h b/device/radstar2/include/radstar2.h
index d550b5b..2f7d071 100644
--- a/device/radstar2/include/radstar2.h
+++ b/device/radstar2/include/radstar2.h
@@ -27,6 +27,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/radsupermoon/include/radsupermoon.h b/device/radsupermoon/include/radsupermoon.h
index dee9d61..6180e15 100644
--- a/device/radsupermoon/include/radsupermoon.h
+++ b/device/radsupermoon/include/radsupermoon.h
@@ -29,6 +29,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/valuecan3/include/valuecan3.h b/device/valuecan3/include/valuecan3.h
index f812238..e9e0d2d 100644
--- a/device/valuecan3/include/valuecan3.h
+++ b/device/valuecan3/include/valuecan3.h
@@ -26,6 +26,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/valuecan4/include/valuecan4.h b/device/valuecan4/include/valuecan4.h
index 283e8a2..59a6d5c 100644
--- a/device/valuecan4/include/valuecan4.h
+++ b/device/valuecan4/include/valuecan4.h
@@ -27,6 +27,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/device/vividcan/include/vividcan.h b/device/vividcan/include/vividcan.h
index 172048c..1963ebf 100644
--- a/device/vividcan/include/vividcan.h
+++ b/device/vividcan/include/vividcan.h
@@ -29,6 +29,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/posix/include/ftdi.h b/platform/posix/include/ftdi.h
index 1757098..c661fbe 100644
--- a/platform/posix/include/ftdi.h
+++ b/platform/posix/include/ftdi.h
@@ -46,6 +46,6 @@ private:
 	FTDIDevice ftdiDevice;
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/posix/include/stm32.h b/platform/posix/include/stm32.h
index e986614..ff729fe 100644
--- a/platform/posix/include/stm32.h
+++ b/platform/posix/include/stm32.h
@@ -26,6 +26,6 @@ private:
 	void writeTask();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/posix/stm32.cpp b/platform/posix/stm32.cpp
index 437c3de..ecef923 100644
--- a/platform/posix/stm32.cpp
+++ b/platform/posix/stm32.cpp
@@ -273,8 +273,8 @@ void STM32::writeTask() {
 		if(!writeQueue.wait_dequeue_timed(writeOp, std::chrono::milliseconds(100)))
 			continue;
 
-		const auto writeSize = writeOp.bytes.size();
-		int actualWritten = ::write(fd, writeOp.bytes.data(), writeSize);
+		const ssize_t writeSize = (ssize_t)writeOp.bytes.size();
+		ssize_t actualWritten = ::write(fd, writeOp.bytes.data(), writeSize);
 		if(actualWritten != writeSize)
 			std::cout << "Failure to write " << writeSize << " bytes, wrote " << actualWritten << std::endl;
 	}
diff --git a/platform/windows/include/ftdi.h b/platform/windows/include/ftdi.h
index 033488a..b54d523 100644
--- a/platform/windows/include/ftdi.h
+++ b/platform/windows/include/ftdi.h
@@ -11,6 +11,6 @@ public:
 	static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"serenum"); }
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/windows/include/pcap.h b/platform/windows/include/pcap.h
index e2b26d4..c7aefd1 100644
--- a/platform/windows/include/pcap.h
+++ b/platform/windows/include/pcap.h
@@ -65,6 +65,6 @@ private:
 	};
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/windows/include/registry.h b/platform/windows/include/registry.h
index 7e342f4..7964833 100644
--- a/platform/windows/include/registry.h
+++ b/platform/windows/include/registry.h
@@ -28,6 +28,6 @@ private:
 	};
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/windows/include/stm32.h b/platform/windows/include/stm32.h
index fc44a7a..26314a7 100644
--- a/platform/windows/include/stm32.h
+++ b/platform/windows/include/stm32.h
@@ -11,6 +11,6 @@ public:
 	static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"usbser"); }
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/windows/include/vcp.h b/platform/windows/include/vcp.h
index 213c72c..7572d94 100644
--- a/platform/windows/include/vcp.h
+++ b/platform/windows/include/vcp.h
@@ -43,6 +43,6 @@ private:
 	void writeTask();
 };
 
-};
+}
 
 #endif
\ No newline at end of file
diff --git a/platform/windows/internal/include/pcapdll.h b/platform/windows/internal/include/pcapdll.h
index ffd2efe..663a750 100644
--- a/platform/windows/internal/include/pcapdll.h
+++ b/platform/windows/internal/include/pcapdll.h
@@ -48,6 +48,6 @@ private:
 	void closeDLL();
 };
 
-};
+}
 
 #endif
\ No newline at end of file