diff options
| author | Stefan Boberg <[email protected]> | 2023-04-19 10:43:28 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-04-19 10:52:48 +0200 |
| commit | 9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2 (patch) | |
| tree | 924c8ede64e087a5bdfeeb87862bc08e325f4ddc /zenutil/zenserverprocess.cpp | |
| parent | added missing #pragma once (diff) | |
| download | zen-9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2.tar.xz zen-9fb9d6ce5aaedd4ecf4f7bdc9c33a94b1e6597b2.zip | |
tweaks for enabling unity builds
mostly changes to make sure anonymous namespaces don't clash and a change to avoid windows headers from leaking into other compilation units
unity builds are not yet enabled by default, but can be enabled by uncommenting this line in the root `xmake.lua`
```
--add_rules("c++.unity_build")
```
Diffstat (limited to 'zenutil/zenserverprocess.cpp')
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 3d9324af9..b43313b7c 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -376,7 +376,7 @@ ZenServerState::ZenServerEntry::AddSponsorProcess(uint32_t PidToAdd) ////////////////////////////////////////////////////////////////////////// -std::atomic<int> TestCounter{0}; +std::atomic<int> ZenServerTestCounter{0}; ZenServerEnvironment::ZenServerEnvironment() { @@ -416,7 +416,7 @@ ZenServerEnvironment::CreateNewTestDir() using namespace std::literals; ExtendableWideStringBuilder<256> TestDir; - TestDir << "test"sv << int64_t(++TestCounter); + TestDir << "test"sv << int64_t(++ZenServerTestCounter); std::filesystem::path TestPath = m_TestBaseDir / TestDir.c_str(); |