ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-24 11:14:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove global namespacing from internal base headers

Browse Source 
Making the Genode namespace global can cause name collisions on
base-linux.

Fix #2158
This commit is contained in:
Emery Hemingway 2016-11-01 19:13:17 +01:00 committed by Christian Helmuth
parent 6dd695f788
commit eff90d759f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/base/src/include/base/internal/output.h
View File

@ -17,8 +17,6 @@
#include <base/output.h> #include <base/output.h>
using namespace Genode;
/** /**
* Convert digit to ASCII value * Convert digit to ASCII value
@ -114,6 +112,8 @@ static inline void out_unsigned(T value, unsigned base, int pad,
template <typename T, typename OUT_CHAR_FN> template <typename T, typename OUT_CHAR_FN>
static inline void out_float(T value, unsigned base, unsigned length, OUT_CHAR_FN const &out_char) static inline void out_float(T value, unsigned base, unsigned length, OUT_CHAR_FN const &out_char)
{ {
using namespace Genode;
/* set flag if value is negative */ /* set flag if value is negative */
int neg = value < 0 ? 1 : 0; int neg = value < 0 ? 1 : 0;
@ -154,7 +154,7 @@ namespace Genode { template <size_t, typename> class Buffered_output; }
* The 'WRITE_FN' functor is called with a null-terminated 'char const *' * The 'WRITE_FN' functor is called with a null-terminated 'char const *'
* as argument. * as argument.
*/ */
template <size_t BUF_SIZE, typename BACKEND_WRITE_FN> template <Genode::size_t BUF_SIZE, typename BACKEND_WRITE_FN>
class Genode::Buffered_output : public Output class Genode::Buffered_output : public Output
{ {
private: private:

4
repos/base/src/lib/base/raw_output.cc
View File

@ -19,10 +19,8 @@
#include <base/internal/output.h> #include <base/internal/output.h>
#include <base/internal/raw_write_string.h> #include <base/internal/raw_write_string.h>
using namespace Genode;
Genode::Output &Genode::Raw::_output()
Output &Raw::_output()
{ {
struct Write_fn { void operator () (char const *s) { raw_write_string(s); } }; struct Write_fn { void operator () (char const *s) { raw_write_string(s); } };