Skip to content

Commit

Permalink
Fix windows x86 warning
Browse files Browse the repository at this point in the history
  • Loading branch information
yrivardmulrooney committed May 25, 2022
1 parent 341b4af commit 5cee9e3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/logging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void Logger::set_level(LoggingLevel level)

void Logger::disable()
{
s_logger.set_handler({});
s_logger.set_handler(nullptr);
}

void Logger::to_stdout()
Expand Down
10 changes: 10 additions & 0 deletions src/qpid_proton_codec.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
#include "hareflow/qpid_proton_codec.h"

#include <fmt/core.h>

#ifdef _WIN32
# pragma warning(push)
# pragma warning(disable : 4702)
#endif

#include <proton/error.hpp>
#include <proton/message.hpp>
#include <proton/types.hpp>

#ifdef _WIN32
# pragma warning(pop)
#endif

#include "hareflow/exceptions.h"
#include "hareflow/message_builder.h"

Expand Down
37 changes: 22 additions & 15 deletions vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
{
"name": "hareflow",
"version-semver": "0.1.0",
"description": "Hareflow: A RabbitMQ C++ stream client.",
"homepage": "https://github.com/coveooss/hareflow",
"license": "Apache-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",
"version>=": "2021-02-28",
"host": true
},
{
"name": "vcpkg-cmake-config",
"version>=": "2021-02-26",
"host": true
},
{
"name": "fmt",
"version>=": "8.0.1"
},
{
"name": "qpid-proton",
"version>=": "0.37.0#2"
},
{
"name": "vcpkg-cmake",
"host": true,
"version>=": "2021-02-28"
},
{
"name": "vcpkg-cmake-config",
"host": true,
"version>=": "2021-02-26"
}
],
"default-features": [ "boost" ],
"default-features": [
"boost"
],
"features": {
"boost": {
"description": "Use boost from vcpkg",
"dependencies": [
"boost-endian",
{
"name": "boost-asio",
"features": ["ssl"]
}
"features": [
"ssl"
]
},
"boost-endian"
]
}
}
}
}

0 comments on commit 5cee9e3

Please sign in to comment.