Branch 'libkolabxml-1.0' - src/shared_conversions.h

[Jeroen van Meeuwen]

 src/shared_conversions.h |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9c92a5c46563b59d3ef9a9276f7d9abe94701294
Author: Aeneas Jaißle <aj at ajaissle.de>
Date:   Fri Aug 15 00:52:36 2014 +0200

    Fix libkolabxml failing to build with xsd 4.0.0.
    
    In shared_conversions.h, the typedef of simple_type fails as it
    requires two arguments with only one delivered. Adding 'char' as
    the first argument fixes the build, but I haven't tested if the
    built libkolabxml performs as it should do. I don't think the
    attached patch breaks anything.

diff --git a/src/shared_conversions.h b/src/shared_conversions.h
index 119c5e8..5fee33e 100644
--- a/src/shared_conversions.h
+++ b/src/shared_conversions.h
@@ -29,7 +29,11 @@ namespace Kolab {
 typedef boost::shared_ptr<cDateTime> cDateTimePtr;
 
 typedef ::xsd::cxx::tree::type type;
+#if (XSD_INT_VERSION >= 4000000L)
+typedef ::xsd::cxx::tree::simple_type< char, type > simple_type;
+#else
 typedef ::xsd::cxx::tree::simple_type< type > simple_type;
+#endif
 typedef ::xsd::cxx::tree::date< char, simple_type > date;
 typedef ::xsd::cxx::tree::date_time< char, simple_type > date_time;