diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-03-24 21:14:12 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-03-24 21:14:12 +0200 |
| commit | 7207d957dcc2425fc89bab11efd6c5941d630956 (patch) | |
| tree | 7c15ed1e6fcb6bc11a8bc15e215e6865e0f1b463 /libxsd/xsd/cxx/xml/bits | |
| parent | 49129dd75396f109664aa0f2fa9c9d67ab464b80 (diff) | |
Use nil_lit instead of nil as identifier
Some headers in OS X define nil as a macro.
Diffstat (limited to 'libxsd/xsd/cxx/xml/bits')
| -rw-r--r-- | libxsd/xsd/cxx/xml/bits/literals.hxx | 2 | ||||
| -rw-r--r-- | libxsd/xsd/cxx/xml/bits/literals.ixx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libxsd/xsd/cxx/xml/bits/literals.hxx b/libxsd/xsd/cxx/xml/bits/literals.hxx index f3ea6a0..5b9fe99 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.hxx +++ b/libxsd/xsd/cxx/xml/bits/literals.hxx @@ -44,7 +44,7 @@ namespace xsd template <typename C> const C* - nil (); + nil_lit (); template <typename C> const C* diff --git a/libxsd/xsd/cxx/xml/bits/literals.ixx b/libxsd/xsd/cxx/xml/bits/literals.ixx index b24375b..f0ec6eb 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.ixx +++ b/libxsd/xsd/cxx/xml/bits/literals.ixx @@ -73,7 +73,7 @@ namespace xsd template <> inline const char* - nil<char> () + nil_lit<char> () { return "nil"; } @@ -199,7 +199,7 @@ namespace xsd template <> inline const wchar_t* - nil<wchar_t> () + nil_lit<wchar_t> () { return L"nil"; } |