6 files changed, 8 insertions, 8 deletions
diff --git a/libraries/LocalPeer/src/LocalPeer.cpp b/libraries/LocalPeer/src/LocalPeer.cpp
index 3c3d8b4c..b7149c40 100644
--- a/libraries/LocalPeer/src/LocalPeer.cpp
+++ b/libraries/LocalPeer/src/LocalPeer.cpp
@@ -210,7 +210,7 @@ void LocalPeer::receiveConnection()
         return;
     }
 
-    while (socket->bytesAvailable() < (int)sizeof(quint32))
+    while (socket->bytesAvailable() < static_cast<int>(sizeof(quint32)))
     {
         socket->waitForReadyRead();
     }
diff --git a/libraries/extra-cmake-modules b/libraries/extra-cmake-modules
new file mode 160000
+Subproject bbcbaff78283270c2beee69afd8d5b91da854af
diff --git a/libraries/hoedown/src/autolink.c b/libraries/hoedown/src/autolink.c
index 3063b1a0..3592b8e3 100644
--- a/libraries/hoedown/src/autolink.c
+++ b/libraries/hoedown/src/autolink.c
@@ -150,7 +150,7 @@ hoedown_autolink__www(
     uint8_t *data,
     size_t max_rewind,
     size_t size,
-    unsigned int flags)
+    hoedown_autolink_flags flags)
 {
     size_t link_end;
 
@@ -186,7 +186,7 @@ hoedown_autolink__email(
     uint8_t *data,
     size_t max_rewind,
     size_t size,
-    unsigned int flags)
+    hoedown_autolink_flags flags)
 {
     size_t link_end, rewind;
     int nb = 0, np = 0;
@@ -242,7 +242,7 @@ hoedown_autolink__url(
     uint8_t *data,
     size_t max_rewind,
     size_t size,
-    unsigned int flags)
+    hoedown_autolink_flags flags)
 {
     size_t link_end, rewind = 0, domain_len;
 
diff --git a/libraries/katabasis/src/DeviceFlow.cpp b/libraries/katabasis/src/DeviceFlow.cpp
index ba1d121d..f78fd620 100644
--- a/libraries/katabasis/src/DeviceFlow.cpp
+++ b/libraries/katabasis/src/DeviceFlow.cpp
@@ -445,7 +445,7 @@ void DeviceFlow::onRefreshError(QNetworkReply::NetworkError error, QNetworkReply
     if(refreshReply) {
         refreshReply->deleteLater();
     }
-    qDebug() << "DeviceFlow::onRefreshFinished: Error" << (int)error << " - " << errorString;
+    qDebug() << "DeviceFlow::onRefreshFinished: Error" << static_cast<int>(error) << " - " << errorString;
 }
 
 }
diff --git a/libraries/murmur2/src/MurmurHash2.cpp b/libraries/murmur2/src/MurmurHash2.cpp
index b625efb1..c13608f0 100644
--- a/libraries/murmur2/src/MurmurHash2.cpp
+++ b/libraries/murmur2/src/MurmurHash2.cpp
@@ -55,12 +55,12 @@ uint32_t MurmurHash2(std::ifstream&& file_stream, std::size_t buffer_size, std::
 
             // Mix 4 bytes at a time into the hash
             if (index == 0)
-                FourBytes_MurmurHash2((unsigned char*)&data, info);
+                FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
         }
     } while (!file_stream.eof());
 
     // Do one last bit shuffle in the hash
-    FourBytes_MurmurHash2((unsigned char*)&data, info);
+    FourBytes_MurmurHash2(reinterpret_cast<unsigned char*>(&data), info);
 
     delete[] buffer;
 
@@ -72,7 +72,7 @@ void FourBytes_MurmurHash2(const unsigned char* data, IncrementalHashInfo& prev)
 {
     if (prev.len >= 4) {
         // Not the final mix
-        uint32_t k = *(uint32_t*)data;
+        uint32_t k = *reinterpret_cast<const uint32_t*>(data);
 
         k *= m;
         k ^= k >> r;
diff --git a/libraries/zlib b/libraries/zlib
new file mode 160000
+Subproject 04f42ceca40f73e2978b50e93806c2a18c1281f