diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-25 08:31:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-28 08:44:38 +0100 |
| commit | c091a9f06d37246de61ad8ecc39fe9fb9f9ec7a7 (patch) | |
| tree | 71960d0b5bb7c22e2861afd0da42354da5d18521 /vcl/glyphy/demo.cxx | |
| parent | 9a2764bda6a680f3ffc6afa4b5bd5710d1fda3c0 (diff) | |
Don't wrap glyphy source files in namespace GLyphyDemo
...as the source files themselves include standard headers, which must not be
included from within a namespace (which confuses clang-cl). According to Tor,
the original intent was to try not to pollute the global namespace, but that
seems to cause no problems in practice (esp. as nothing from these files gets
exported).
Change-Id: I204c1db932996a09d16e84dd5c6033caa5362caa
Diffstat (limited to 'vcl/glyphy/demo.cxx')
| -rwxr-xr-x | vcl/glyphy/demo.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vcl/glyphy/demo.cxx b/vcl/glyphy/demo.cxx index e362e36c6ee3..746a6dcfe84c 100755 --- a/vcl/glyphy/demo.cxx +++ b/vcl/glyphy/demo.cxx @@ -12,10 +12,8 @@ #include <prewin.h> #include <postwin.h> -namespace GLyphyDemo { #include "demo/demo-atlas.cc" #include "demo/demo-buffer.cc" #include "demo/demo-font.cc" #include "demo/demo-shader.cc" #include "demo/matrix4x4.c" -} |