diff options
| author | Stefan Boberg <[email protected]> | 2023-05-09 15:45:10 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-05-09 15:45:10 +0200 |
| commit | 13e01c71e5cf6a15d36e401b3eda1fc10b04d63d (patch) | |
| tree | e08230d92ec3c2b45edd6cdec9c8f07c1f8b9fff /src | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-13e01c71e5cf6a15d36e401b3eda1fc10b04d63d.tar.xz zen-13e01c71e5cf6a15d36e401b3eda1fc10b04d63d.zip | |
fixed merge error
EmitScopesForLogging -> EmitActivitiesForLogging
Diffstat (limited to 'src')
| -rw-r--r-- | src/zencore/include/zencore/logging.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/zencore/include/zencore/logging.h b/src/zencore/include/zencore/logging.h index 1f5c56e89..56f13e1c2 100644 --- a/src/zencore/include/zencore/logging.h +++ b/src/zencore/include/zencore/logging.h @@ -184,7 +184,7 @@ private: const Lambda m_CapturedFunc; }; -std::string_view EmitScopesForLogging(StringBuilderBase& OutString); +std::string_view EmitActivitiesForLogging(StringBuilderBase& OutString); #define ZEN_LOG_SCOPE(...) ScopedLazyActivity Activity$##__LINE__([&](StringBuilderBase& Out) { Out << fmt::format(__VA_ARGS__); }) @@ -192,7 +192,7 @@ std::string_view EmitScopesForLogging(StringBuilderBase& OutString); do \ { \ ExtendableStringBuilder<256> ScopeString; \ - const std::string_view Scopes = EmitScopesForLogging(ScopeString); \ + const std::string_view Scopes = EmitActivitiesForLogging(ScopeString); \ ZEN_LOG_WITH_LOCATION(Log(), \ spdlog::source_loc(__FILE__, __LINE__, SPDLOG_FUNCTION), \ spdlog::level::err, \ @@ -205,7 +205,7 @@ std::string_view EmitScopesForLogging(StringBuilderBase& OutString); do \ { \ ExtendableStringBuilder<256> ScopeString; \ - const std::string_view Scopes = EmitScopesForLogging(ScopeString); \ + const std::string_view Scopes = EmitActivitiesForLogging(ScopeString); \ ZEN_LOG_WITH_LOCATION(Log(), \ spdlog::source_loc(__FILE__, __LINE__, SPDLOG_FUNCTION), \ spdlog::level::critical, \ @@ -216,6 +216,6 @@ std::string_view EmitScopesForLogging(StringBuilderBase& OutString); ScopedActivityBase* GetThreadActivity(); -void logging_forcelink(); // internal +void logging_forcelink(); // internal } // namespace zen |