From 71af04669c418e6312320bf098dd9928854f4d00 Mon Sep 17 00:00:00 2001 From: warptangent Date: Fri, 8 May 2015 11:32:20 -0700 Subject: [PATCH] Update log statements Use filesystem path conversion to string() instead of c_str(). Windows may otherwise output an address. --- src/blockchain_converter/fake_core.h | 2 +- src/blockchain_db/lmdb/db_lmdb.cpp | 2 +- src/cryptonote_core/cryptonote_core.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/blockchain_converter/fake_core.h b/src/blockchain_converter/fake_core.h index f82b05d0..79fb5184 100644 --- a/src/blockchain_converter/fake_core.h +++ b/src/blockchain_converter/fake_core.h @@ -62,7 +62,7 @@ struct fake_core_lmdb folder /= db->get_db_name(); - LOG_PRINT_L0("Loading blockchain from folder " << folder.c_str() << " ..."); + LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ..."); const std::string filename = folder.string(); try diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index 8e09dfab..5126db40 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -659,7 +659,7 @@ void BlockchainLMDB::open(const std::string& filename, const int mdb_flags) if (boost::filesystem::exists(old_files / "data.mdb") || boost::filesystem::exists(old_files / "lock.mdb")) { - LOG_PRINT_L0("Found existing LMDB files in " << old_files.c_str()); + LOG_PRINT_L0("Found existing LMDB files in " << old_files.string()); LOG_PRINT_L0("Move data.mdb and/or lock.mdb to " << filename << ", or delete them, and then restart"); throw DB_ERROR("Database could not be opened"); } diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index a5517e01..2037a8c2 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -237,7 +237,7 @@ namespace cryptonote folder /= db->get_db_name(); - LOG_PRINT_L0("Loading blockchain from folder " << folder.c_str() << " ..."); + LOG_PRINT_L0("Loading blockchain from folder " << folder.string() << " ..."); const std::string filename = folder.string(); try