All the minor updates necessary to build on mac

These are weird changes, mostly brought about by the weird state
of C++ headers on macOS. There all very minor changes though,
so they should still work on linux (I didn't test that though :( )

Author: edbrown23

decibel-cpp/include/decibel/Protobuf.h

@@ -100,8 +100,10 @@ struct ProtobufSetter
 
 DEFINE_PROTOBUF_FIELD_MAPPING(int32_t, Int32);
 DEFINE_PROTOBUF_FIELD_MAPPING(int64_t, Int64);
+DEFINE_PROTOBUF_FIELD_MAPPING(long, Int64);
 DEFINE_PROTOBUF_FIELD_MAPPING(uint32_t, UInt32);
 DEFINE_PROTOBUF_FIELD_MAPPING(uint64_t, UInt64);
+DEFINE_PROTOBUF_FIELD_MAPPING(unsigned long, UInt64);
 DEFINE_PROTOBUF_FIELD_MAPPING(float, Float);
 DEFINE_PROTOBUF_FIELD_MAPPING(double, Double);
 DEFINE_PROTOBUF_FIELD_MAPPING(bool, Bool);

decibel-cpp/include/decibel/messaging/ProtobufProtocolFactory.h

@@ -51,7 +51,7 @@ class ProtobufProtocolFactory : public IProtocolFactory
         {
             auto protocol = std::make_unique<ProtocolT>(mDispatcher);
             protocol->RegisterSendErrorCallback(*mSendErrorCallback);
-            return protocol;
+            return std::move(protocol);
         }
         else
         {

decibel-cpp/include/decibel/messaging/RabbitMQMessageHandler.h

@@ -18,7 +18,7 @@ class RabbitMQMessageHandler : public IRabbitMQMessageHandler
     virtual void HandleData(AMQP::Message&& message, uint64_t, bool)
     {
         MessageType protobufMessage;
-        protobufMessage.ParseFromString(message.message());
+        protobufMessage.ParseFromString(std::string(message.body()));
         HandleMessage(std::move(protobufMessage));
     }
 

decibel-cpp/include/decibel/messaging/Reactor.h

@@ -22,7 +22,7 @@ namespace messaging
 class Protocol;
 class IProtocolFactory;
 
-class Reactor : public folly::Executor, public folly::Timekeeper
+class Reactor : public folly::Timekeeper
 {
 public:
     Reactor();
@@ -71,7 +71,7 @@ class Reactor : public folly::Executor, public folly::Timekeeper
     }
 
     // folly::Executor
-    virtual void add(folly::Func fn);
+    // virtual void add(folly::Func fn);
 
     // folly::TimeKeeper
     virtual folly::Future<folly::Unit> after(folly::Duration duration);

decibel-cpp/include/decibel/stdlib.h

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#ifndef __cpp_lib_make_unique
+#if !defined __cpp_lib_make_unique && !defined __APPLE__
 
 namespace std
 {

decibel-cpp/src/decibel/messaging/Reactor.cpp

@@ -28,8 +28,7 @@ namespace decibel
 namespace messaging
 {
 Reactor::Reactor()
-    : folly::Executor()
-    , folly::Timekeeper()
+    : folly::Timekeeper()
     , mEventLoop()
     , mpTimer(
           std::make_unique<EventLoopTimer>(niceuv::EventLoopTimer(&mEventLoop)))
@@ -153,10 +152,12 @@ void Reactor::CancelCall(std::shared_ptr<OneShotTimerEvent> pTimer)
     pTimer->Stop();
 }
 
-void Reactor::add(folly::Func fn)
-{
-    CallSoon(fn);
-}
+// This is kept around for posterity should anyone want to add back
+// folly::Executor functionality
+// void Reactor::add(folly::Func fn)
+// {
+//     CallSoon(fn);
+// }
 
 folly::Future<folly::Unit> Reactor::after(folly::Duration duration)
 {

decibel-cpp/src/decibel/messaging/TcpServer.cpp

@@ -23,7 +23,7 @@ TcpServer::TcpServer(niceuv::EventLoop* loop,
     : mServer(new niceuv::TcpServer(loop)), mProtocols()
 {
     auto connectCb = [factory, this, host, port](niceuv::TcpConnPtr conn) {
-        auto pProtocol = std::move(factory->Construct());
+        auto pProtocol = factory->Construct();
         auto rawpConn = conn.get();
         auto pTransport =
             std::make_unique<TcpTransport>(std::move(conn), host, port);

decibel-cpp/src/decibel/niceuv/WorkCancellable.cpp

@@ -1,5 +1,8 @@
 #include "decibel/niceuv/WorkCancellable.h"
 
+#include <exception>
+#include <stdexcept>
+
 namespace decibel
 {
 namespace niceuv

decibel-cpp/test/test_reactor.cpp

@@ -153,12 +153,14 @@ TEST(TestSelfConnectMultiClients, ConnectTcp)
     ASSERT_EQ(1, rawpProto2->mConnectionLostCalls);
 }
 
-TEST(TestReactor, FollyExecutorAdd)
-{
-    dm::Reactor r;
-    bool then_called = false;
-    auto fut = folly::makeFuture().via(&r).then([&]() { then_called = true; });
-    ASSERT_FALSE(then_called);
-    r.Start();
-    ASSERT_TRUE(then_called);
-}
+// This is kept around for posterity should anyone want to add back
+// folly::Executor functionality
+// TEST(TestReactor, FollyExecutorAdd)
+// {
+//     dm::Reactor r;
+//     bool then_called = false;
+//     auto fut = folly::makeFuture().via(&r).then([&]() { then_called = true; });
+//     ASSERT_FALSE(then_called);
+//     r.Start();
+//     ASSERT_TRUE(then_called);
+// }

src/ConfigTypes.h

@@ -73,6 +73,21 @@ class ConfigValue
         }
     }
 
+    template <typename T>
+    ConfigType<T> ToConfigType() const
+    {
+        BOOST_ASSERT_MSG(!mEmpty, "Can't dereference Empty Value");
+        try
+        {
+            return boost::get<ConfigType<T>>(mValue);
+        }
+        catch (const boost::bad_get& ex)
+        {
+            BOOST_ASSERT_MSG(false, "Requested incorrect type from variant");
+            return ConfigType<T>({});
+        }
+    }
+
     template <typename T>
     bool Is() const
     {