diff options
| author | Aeneas Jaißle <aj@ajaissle.de> | 2014-08-14 22:52:36 (GMT) |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2014-08-14 22:52:36 (GMT) |
| commit | 2453e6c360e8b0898a6065f1aba4c85bac2fdfdc (patch) | |
| tree | 21b58ce5e4e314283ac8b0cb8f0701a3efd296e6 | |
| parent | 386661d18f0b56b9c167ded87ac9d197d038f516 (diff) | |
| download | libkolabxml-2453e6c360e8b0898a6065f1aba4c85bac2fdfdc.tar.gz | |
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.
| -rw-r--r-- | src/shared_conversions.h | 4 |
1 files changed, 4 insertions, 0 deletions
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; |