Skip to content

Commit ba10813

Browse files
committed
Logging.h:
* Renaming namespace log with logging because of namespace clash with the log function (or something like that).
1 parent d352438 commit ba10813

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

GameEngine.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ class GameEngine
299299

300300
curr_rnd_seed = rnd::srand_time();
301301

302-
log::setup_logging(m_params.log_mode, m_params.xcode_log_filepath, curr_rnd_seed);
302+
logging::setup_logging(m_params.log_mode, m_params.xcode_log_filepath, curr_rnd_seed);
303303

304304
if (time_inited.once())
305305
real_start_time_s = std::chrono::steady_clock::now();
@@ -357,7 +357,7 @@ class GameEngine
357357
return_cursor();
358358
sh.clear();
359359

360-
log::update_log_stream(m_params.log_mode, kpdp, keyboard.get(), get_frame_count());
360+
logging::update_log_stream(m_params.log_mode, kpdp, keyboard.get(), get_frame_count());
361361
auto key = keyboard::get_char_key(kpdp.transient);
362362
auto lo_key = str::to_lower(key);
363363
auto quit = lo_key == 'q';
@@ -574,7 +574,7 @@ class GameEngine
574574
}
575575
}
576576

577-
if (log::log_finished)
577+
if (logging::log_finished)
578578
exit(EXIT_SUCCESS);
579579

580580
return true;

Logging.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
enum class LogMode { None, Record, Replay };
1212

13-
namespace log
13+
namespace logging
1414
{
1515
std::ofstream rec_file;
1616
std::ifstream rep_file;

0 commit comments

Comments
 (0)