Skip to content

Commit

Permalink
fix compiling
Browse files Browse the repository at this point in the history
- user `+` instead of stream operator to append data to a string
- use literal operator to convert C strings
  • Loading branch information
psychocrypt authored and fireice-uk committed Aug 6, 2018
1 parent 156164c commit 97779a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/address_validator/address_validator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ int main(int argc, char *argv[])
gulps::inst().set_thread_tag("MAIN");

// We won't replace the custom output writer here, so just direct **our** errors to console
std::unique_ptr<gulps::gulps_output> out(new gulps::gulps_print_output(true, fmt::color:white));
std::unique_ptr<gulps::gulps_output> out(new gulps::gulps_print_output(true, fmt::color::white));
out->add_filter([](const gulps::message& msg) -> bool { return msg.cat_major == GULPS_CAT_MAJOR && msg.lvl == gulps::LEVEL_ERROR; });
gulps::inst().add_output(std::move(out));

Expand Down
1 change: 1 addition & 0 deletions src/common/gulps.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <list>
#include <vector>
#include "thdq.hpp"
#include "string.hpp"
#include <fmt/format.h>
#include <fmt/time.h>

Expand Down
2 changes: 1 addition & 1 deletion src/cryptonote_basic/cryptonote_basic_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ bool get_account_address_from_str(address_parse_info &info, std::string const &s
break;
*/
default:
GULPS_ERROR("Wrong address prefix: " << prefix);
GULPS_ERROR("Wrong address prefix: "_s + std::to_string(prefix));
return false;
}

Expand Down

0 comments on commit 97779a5

Please sign in to comment.