unity build fixes (#802)

Various fixes to make cpp files build in unity build mode

as an aside using Unity build doesn't really seem to work on Linux, unsure why but it leads to link-time issues

1 files changed, 5 insertions, 4 deletions

diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp
index 5254ef3cf..ffdc5fe48 100644
--- a/src/zen/cmds/builds_cmd.cpp
+++ b/src/zen/cmds/builds_cmd.cpp
@@ -67,13 +67,11 @@ ZEN_THIRD_PARTY_INCLUDES_END
 
 static const bool DoExtraContentVerify = false;
 
-#define ZEN_CLOUD_STORAGE "Cloud Storage"
-
 namespace zen {
 
 using namespace std::literals;
 
-namespace {
+namespace builds_impl {
 	static std::atomic<bool> AbortFlag = false;
 	static std::atomic<bool> PauseFlag = false;
 
@@ -270,6 +268,7 @@ namespace {
 	static bool				 IsQuiet	  = false;
 	static ProgressBar::Mode ProgressMode = ProgressBar::Mode::Pretty;
 
+#undef ZEN_CONSOLE_VERBOSE
 #define ZEN_CONSOLE_VERBOSE(fmtstr, ...)                                   \
 	if (IsVerbose)                                                         \
 	{                                                                      \
@@ -2009,12 +2008,13 @@ namespace {
 		ProgressBar::SetLogOperationProgress(ProgressMode, TaskSteps::Cleanup, TaskSteps::StepCount);
 	}
 
-}  // namespace
+}  // namespace builds_impl
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 BuildsCommand::BuildsCommand()
 {
+	using namespace builds_impl;
 	m_Options.add_options()("h,help", "Print help");
 
 	auto AddSystemOptions = [this](cxxopts::Options& Ops) {
@@ -2655,6 +2655,7 @@ BuildsCommand::~BuildsCommand() = default;
 void
 BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 {
+	using namespace builds_impl;
 	ZEN_UNUSED(GlobalOptions);
 
 	signal(SIGINT, SignalCallbackHandler);