From 7207d957dcc2425fc89bab11efd6c5941d630956 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 24 Mar 2010 21:14:12 +0200
Subject: Use nil_lit instead of nil as identifier

Some headers in OS X define nil as a macro.
---
 libxsd/xsd/cxx/xml/bits/literals.hxx | 2 +-
 libxsd/xsd/cxx/xml/bits/literals.ixx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libxsd/xsd/cxx/xml/bits')

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";
         }
-- 
cgit v1.1