Skip to content

Commit

Permalink
Merge 245a907 into 67ec8d5
Browse files Browse the repository at this point in the history
  • Loading branch information
ken-matsui committed Nov 19, 2019
2 parents 67ec8d5 + 245a907 commit a6f9a85
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 4 deletions.
1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -139,6 +139,7 @@ build_script:
mkdir build && cd build &&
cmake .. -G "%GENERATOR%" ^
-DENABLE_STATIC=ON ^
-Dpoac_BUILD_TEST=ON ^
-DBoost_USE_STATIC_LIBS=ON ^
-DBoost_USE_STATIC_RUNTIME=ON ^
-DBOOST_ROOT=%BOOST_BUILT_PATH% ^
Expand Down
1 change: 1 addition & 0 deletions include/poac/core/resolver/resolve.hpp
Expand Up @@ -331,6 +331,7 @@ namespace poac::core::resolver::resolve {
for (const auto& [name, package] : deps) {
// Check if root package is resolved dependency (by interval)
for (const auto& [n, i, versions] : interval_cache) {
(void)versions;
if (name == n && package.version == i) {
continue;
}
Expand Down
12 changes: 12 additions & 0 deletions include/poac/io/net.hpp
Expand Up @@ -13,6 +13,14 @@
#include <variant>
#include <optional>

#include <boost/predef.h>
#include <boost/asio.hpp>

// https://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue
#if BOOST_OS_WINDOWS
# define BOOST_ASIO_NO_WIN32_LEAN_AND_MEAN
#endif

#include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
#include <boost/asio/connect.hpp>
Expand All @@ -28,6 +36,10 @@
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>

#if BOOST_OS_WINDOWS
# include <windows.h>
#endif

#include <poac/core/except.hpp>
#include <poac/io/filesystem.hpp>
#include <poac/io/term.hpp>
Expand Down
3 changes: 1 addition & 2 deletions include/poac/opts/graph.hpp
Expand Up @@ -144,8 +144,7 @@ namespace poac::opts::graph {
console_output(std::future<std::optional<io::config::Config>>&& config) {
const auto [g, names] = create_graph(std::move(config));
static_cast<void>(names); // error: unused variable
boost::graph_traits<Graph>::edge_iterator itr, end;
for (tie(itr, end) = edges(g); itr != end; ++itr) {
for (auto [itr, end] = edges(g); itr != end; ++itr) {
std::cout << boost::get(&Vertex::name, g)[source(*itr, g)] << " -> "
<< boost::get(&Vertex::name, g)[target(*itr, g)] << '\n';
}
Expand Down
1 change: 1 addition & 0 deletions include/poac/util/cfg.hpp
Expand Up @@ -271,6 +271,7 @@ namespace poac::util::cfg {
std::optional<Token>
peek() const {
const auto [diff, token] = tokenize(this->index);
(void)diff;
return token;
}

Expand Down
4 changes: 4 additions & 0 deletions include/poac/util/semver/comparison.hpp
Expand Up @@ -6,6 +6,10 @@

#include <poac/util/semver/version.hpp>

// https://yohhoy.hatenadiary.jp/entry/20120115/p1
#undef min
#undef max

namespace semver {
namespace detail {
constexpr bool
Expand Down
3 changes: 2 additions & 1 deletion include/poac/util/types.hpp
@@ -1,10 +1,11 @@
#ifndef POAC_UTIL_TYPES_HPP
#define POAC_UTIL_TYPES_HPP

#include <optional>
#include <stack>
#include <type_traits>
#include <utility>
#include <vector>
#include <stack>

namespace poac::util::types {
// If the type T is a reference type, provides the member typedef type
Expand Down
1 change: 0 additions & 1 deletion tests/cli.cpp
Expand Up @@ -3,7 +3,6 @@
#include <vector>
#include <string>
#include <poac/core/cli.hpp>
#include <poac/core/except.hpp>

BOOST_AUTO_TEST_CASE( poac_core_cli_execute_test )
{
Expand Down

0 comments on commit a6f9a85

Please sign in to comment.