Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Fix warning ISO C++11 does not allow conversion from string literal to
'char *
  • Loading branch information
Filip Gawin committed Sep 29, 2020
1 parent 8424eab commit eeb26cfc7db1b010e9b9373f6f3f5bce3f2240fa
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/core/timebars.cpp
  2. +2 −2 src/core/timebars.h
@@ -50,15 +50,15 @@ void tbInit()
#endif #endif
} }


void tbStartTimer(int32 unk, char *name) void tbStartTimer(int32 unk, const char *name)
{ {
strcpy(TimerBar.Timers[TimerBar.count].name, name); strcpy(TimerBar.Timers[TimerBar.count].name, name);
TimerBar.Timers[TimerBar.count].unk = unk; TimerBar.Timers[TimerBar.count].unk = unk;
TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame(); TimerBar.Timers[TimerBar.count].startTime = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerFrame();
TimerBar.count++; TimerBar.count++;
} }


void tbEndTimer(char* name) void tbEndTimer(const char* name)
{ {
uint32 n = 1500; uint32 n = 1500;
for (uint32 i = 0; i < TimerBar.count; i++) { for (uint32 i = 0; i < TimerBar.count; i++) {
@@ -1,6 +1,6 @@
#pragma once #pragma once


void tbInit(); void tbInit();
void tbStartTimer(int32, char*); void tbStartTimer(int32, const char*);
void tbEndTimer(char*); void tbEndTimer(const char*);
void tbDisplay(); void tbDisplay();

0 comments on commit eeb26cf

Please sign in to comment.