From 7d2a75856f18db4b6cbb026c56211ab7ebc39b97 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 27 Jun 2016 16:38:42 +0200 Subject: [PATCH] dde_linux: move Format_command class to Lx namespace Otherwise the class symbols may clash with other global symbols (in base console.cc). --- repos/dde_linux/src/lx_kit/printf.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/repos/dde_linux/src/lx_kit/printf.cc b/repos/dde_linux/src/lx_kit/printf.cc index ac63651bf4..531b6efc83 100644 --- a/repos/dde_linux/src/lx_kit/printf.cc +++ b/repos/dde_linux/src/lx_kit/printf.cc @@ -19,7 +19,10 @@ #include -namespace Lx { class Console; } +namespace Lx { + class Console; + class Format_command; +} extern "C" int stdout_write(const char *s); @@ -28,7 +31,7 @@ static const bool verbose_console = false; /** * Format string command representation */ -class Format_command +class Lx::Format_command { public: @@ -300,7 +303,6 @@ class Lx::Console void vprintf(const char *format, va_list list) { - while (*format) { /* eat and output plain characters */