3party/easy_profiler
0
0
Fork 0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-25 23:40:51 +08:00
Code Issues Projects Releases Wiki Activity

Rename the function now() as well

Browse Source
This commit is contained in:
Ming Li 2024-08-28 20:55:26 +02:00
parent 88f24f4763
commit 67edc2d77f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
easy_profiler_core/include/easy/profiler.h
View File

@ -464,7 +464,7 @@ namespace profiler {
\ingroup profiler
*/
PROFILER_API timestamp_t now();
PROFILER_API timestamp_t timeNow();
/** Convert ticks to nanoseconds.
@ -766,7 +766,7 @@ namespace profiler {
}
#else
inline EASY_CONSTEXPR_FCN timestamp_t now() { return 0; }
inline EASY_CONSTEXPR_FCN timestamp_t timeNow() { return 0; }
inline EASY_CONSTEXPR_FCN timestamp_t toNanoseconds(timestamp_t) { return 0; }
inline EASY_CONSTEXPR_FCN timestamp_t toMicroseconds(timestamp_t) { return 0; }
inline const BaseBlockDescriptor* registerDescription(EasyBlockStatus, const char*, const char*, const char*, int, block_type_t, color_t, bool = false)
@ -898,7 +898,7 @@ namespace profiler {
\ingroup profiler
*/
EASY_FORCE_INLINE timestamp_t currentTime() { return now(); }
EASY_FORCE_INLINE timestamp_t currentTime() { return timeNow(); }
//////////////////////////////////////////////////////////////////////

4
easy_profiler_core/profiler.cpp
View File

@ -127,7 +127,7 @@ PROFILER_API const char* apiVersionName()
#if !defined(EASY_PROFILER_API_DISABLED)
PROFILER_API profiler::timestamp_t now()
PROFILER_API profiler::timestamp_t timeNow()
{
return profiler::clock::now();
}
@ -295,7 +295,7 @@ PROFILER_API profiler::timestamp_t main_thread_frameTimeLocalAvg(profiler::Durat
#else // EASY_PROFILER_API_DISABLED
PROFILER_API profiler::timestamp_t now() { return 0; }
PROFILER_API profiler::timestamp_t timeNow() { return 0; }
PROFILER_API profiler::timestamp_t toNanoseconds(profiler::timestamp_t) { return 0; }
PROFILER_API profiler::timestamp_t toMicroseconds(profiler::timestamp_t) { return 0; }