summaryrefslogtreecommitdiff
path: root/libxsd/xsd
diff options
context:
space:
mode:
Diffstat (limited to 'libxsd/xsd')
-rw-r--r--libxsd/xsd/buildfile39
-rw-r--r--libxsd/xsd/cxx/parser/expat/elements.hxx6
-rw-r--r--libxsd/xsd/cxx/parser/expat/elements.txx5
-rw-r--r--libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx7
-rw-r--r--libxsd/xsd/cxx/tree/containers.hxx12
-rw-r--r--libxsd/xsd/cxx/tree/date-time.hxx45
-rw-r--r--libxsd/xsd/cxx/tree/elements.hxx20
-rw-r--r--libxsd/xsd/cxx/tree/list.hxx10
-rw-r--r--libxsd/xsd/cxx/tree/types.hxx24
-rw-r--r--libxsd/xsd/cxx/version.hxx27
-rw-r--r--libxsd/xsd/cxx/version.hxx.in43
-rw-r--r--libxsd/xsd/cxx/xml/char-utf8.txx4
-rw-r--r--libxsd/xsd/cxx/xml/dom/auto-ptr.hxx3
13 files changed, 210 insertions, 35 deletions
diff --git a/libxsd/xsd/buildfile b/libxsd/xsd/buildfile
new file mode 100644
index 0000000..ef0d0c5
--- /dev/null
+++ b/libxsd/xsd/buildfile
@@ -0,0 +1,39 @@
+# file : xsd/buildfile
+# license : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+# Note that libxsd includes headers of some third-party libraries (Xerces-C++,
+# Expat, ACE) and APIs (XDR) into some of its headers. We consider
+# functionality provided by these headers as optional and assume that libxsd
+# dependents that require such functionality will handle the respective
+# dependencies (in buildfiles, manifests, etc) themselves. An alternative would
+# be to split libxsd into the hierarchy of libraries, but it doesn't feel very
+# practical at the moment.
+#
+lib{xsd}: cxx/{hxx ixx txx}{** -version} cxx/hxx{version}
+
+# Include the generated version header into the distribution (so that we don't
+# pick up an installed one) and don't remove it when cleaning in src (so that
+# clean results in a state identical to distributed).
+#
+cxx/
+{
+ hxx{version}: in{version} $src_root/manifest
+ hxx{version}:
+ {
+ dist = true
+ clean = ($src_root != $out_root)
+ }
+}
+
+# Export options.
+#
+lib{xsd}: cxx.export.poptions = "-I$out_root" "-I$src_root"
+
+# Install into the xsd/ subdirectory of, say, /usr/include/ recreating
+# subdirectories.
+#
+{hxx ixx txx}{*}:
+{
+ install = include/xsd/
+ install.subdirs = true
+}
diff --git a/libxsd/xsd/cxx/parser/expat/elements.hxx b/libxsd/xsd/cxx/parser/expat/elements.hxx
index 5ed41f3..bd0b84c 100644
--- a/libxsd/xsd/cxx/parser/expat/elements.hxx
+++ b/libxsd/xsd/cxx/parser/expat/elements.hxx
@@ -86,6 +86,12 @@ namespace xsd
return parser_;
}
+ void
+ reset (XML_Parser parser)
+ {
+ *this = parser;
+ }
+
private:
parser_auto_ptr (const parser_auto_ptr&);
diff --git a/libxsd/xsd/cxx/parser/expat/elements.txx b/libxsd/xsd/cxx/parser/expat/elements.txx
index a1b1beb..803c53c 100644
--- a/libxsd/xsd/cxx/parser/expat/elements.txx
+++ b/libxsd/xsd/cxx/parser/expat/elements.txx
@@ -312,7 +312,7 @@ namespace xsd
if (XML_Parse (parser.get (),
buf,
- is.gcount (),
+ static_cast<int> (is.gcount ()),
is.eof ()) == XML_STATUS_ERROR)
{
r = false;
@@ -337,7 +337,8 @@ namespace xsd
//
if (auto_xml_parser_.get () == 0)
{
- auto_xml_parser_ = XML_ParserCreateNS (0, XML_Char (' '));
+ auto_xml_parser_.reset (
+ XML_ParserCreateNS (0, XML_Char (' ')));
if (auto_xml_parser_.get () == 0)
throw std::bad_alloc ();
diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
index 5ef2455..7bf2523 100644
--- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
+++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx
@@ -5,6 +5,7 @@
#include <locale>
#ifdef XSD_CXX11
+# include <cmath> // std::isfinite
# include <utility> // std::move
#endif
@@ -716,9 +717,13 @@ namespace xsd
zc_istream<C> is (str);
is.imbue (std::locale::classic ());
- //@@ TODO: now we accept scientific notations and INF/NaN.
+ // Note that std::isfinite() returns false for INF/NaN.
//
+#ifdef XSD_CXX11
+ if (!(is >> value_ && std::isfinite (value_) && is.exhausted ()))
+#else
if (!(is >> value_ && is.exhausted ()))
+#endif
throw invalid_value<C> (bits::decimal<C> (), str);
}
diff --git a/libxsd/xsd/cxx/tree/containers.hxx b/libxsd/xsd/cxx/tree/containers.hxx
index f6a24ff..3e26ca3 100644
--- a/libxsd/xsd/cxx/tree/containers.hxx
+++ b/libxsd/xsd/cxx/tree/containers.hxx
@@ -858,6 +858,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ sequence&
+ operator= (const sequence&) = default;
+#endif
+
public:
void
assign (size_type n, const T& x)
@@ -1090,7 +1095,7 @@ namespace xsd
}
// Note that the container object of the two sequences being
- // swapped should be the same.
+ // swapped should be the same.
//
void
swap (sequence& x)
@@ -1132,6 +1137,11 @@ namespace xsd
: base_sequence (s)
{
}
+
+#ifdef XSD_CXX11
+ sequence&
+ operator= (const sequence&) = default;
+#endif
};
diff --git a/libxsd/xsd/cxx/tree/date-time.hxx b/libxsd/xsd/cxx/tree/date-time.hxx
index eb9efce..d5d06ec 100644
--- a/libxsd/xsd/cxx/tree/date-time.hxx
+++ b/libxsd/xsd/cxx/tree/date-time.hxx
@@ -210,6 +210,11 @@ namespace xsd
*/
gday (const gday& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ gday&
+ operator= (const gday&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -371,6 +376,11 @@ namespace xsd
*/
gmonth (const gmonth& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ gmonth&
+ operator= (const gmonth&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -532,6 +542,11 @@ namespace xsd
*/
gyear (const gyear& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ gyear&
+ operator= (const gyear&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -696,6 +711,11 @@ namespace xsd
*/
gmonth_day (const gmonth_day& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ gmonth_day&
+ operator= (const gmonth_day&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -880,6 +900,11 @@ namespace xsd
*/
gyear_month (const gyear_month& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ gyear_month&
+ operator= (const gyear_month&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -1068,6 +1093,11 @@ namespace xsd
*/
date (const date& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ date&
+ operator= (const date&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -1269,6 +1299,11 @@ namespace xsd
*/
time (const time& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ time&
+ operator= (const time&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -1493,6 +1528,11 @@ namespace xsd
virtual date_time*
_clone (flags f = 0, container* c = 0) const;
+#ifdef XSD_CXX11
+ date_time&
+ operator= (const date_time&) = default;
+#endif
+
/**
* @brief Create an instance from a data representation
* stream.
@@ -1723,6 +1763,11 @@ namespace xsd
*/
duration (const duration& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ duration&
+ operator= (const duration&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
diff --git a/libxsd/xsd/cxx/tree/elements.hxx b/libxsd/xsd/cxx/tree/elements.hxx
index 808b35e..cff1ada 100644
--- a/libxsd/xsd/cxx/tree/elements.hxx
+++ b/libxsd/xsd/cxx/tree/elements.hxx
@@ -235,6 +235,8 @@ namespace xsd
std::size_t index;
};
+ //@cond
+
bool
operator== (const content_order&, const content_order&);
@@ -244,8 +246,6 @@ namespace xsd
bool
operator< (const content_order&, const content_order&);
- //@cond
-
// DOM user data keys.
//
template <int dummy>
@@ -458,7 +458,9 @@ namespace xsd
// anyType content API.
//
public:
+ //@cond
typedef element_optional dom_content_optional;
+ //@endcond
/**
* @brief Return a read-only (constant) reference to the anyType
@@ -1198,10 +1200,10 @@ namespace xsd
dom_content_optional dom;
};
- //@endcond
-
mutable XSD_AUTO_PTR<content_type> content_;
+ //@endcond
+
private:
container* container_;
};
@@ -1252,6 +1254,11 @@ namespace xsd
*/
simple_type (const simple_type& x, flags f = 0, container* c = 0);
+#ifdef XSD_CXX11
+ simple_type&
+ operator= (const simple_type&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -1615,6 +1622,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ fundamental_base&
+ operator= (const fundamental_base&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
diff --git a/libxsd/xsd/cxx/tree/list.hxx b/libxsd/xsd/cxx/tree/list.hxx
index f83297a..c44c882 100644
--- a/libxsd/xsd/cxx/tree/list.hxx
+++ b/libxsd/xsd/cxx/tree/list.hxx
@@ -62,6 +62,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ list&
+ operator= (const list&) = default;
+#endif
+
public:
list (const xercesc::DOMElement&, flags = 0, container* c = 0);
@@ -112,6 +117,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ list&
+ operator= (const list&) = default;
+#endif
+
public:
list (const xercesc::DOMElement&, flags = 0, container* c = 0);
diff --git a/libxsd/xsd/cxx/tree/types.hxx b/libxsd/xsd/cxx/tree/types.hxx
index 3355eb0..30b2209 100644
--- a/libxsd/xsd/cxx/tree/types.hxx
+++ b/libxsd/xsd/cxx/tree/types.hxx
@@ -1078,6 +1078,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ nmtokens&
+ operator= (const nmtokens&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -2559,6 +2564,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ idrefs&
+ operator= (const idrefs&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -2967,6 +2977,11 @@ namespace xsd
//
}
+#ifdef XSD_CXX11
+ qname&
+ operator= (const qname&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
@@ -3123,7 +3138,9 @@ namespace xsd
class base64_binary: public B, public buffer<C>
{
public:
+ //@cond
typedef typename buffer<C>::size_t size_t;
+ //@endcond
public:
/**
@@ -3342,7 +3359,9 @@ namespace xsd
class hex_binary: public B, public buffer<C>
{
public:
+ //@cond
typedef typename buffer<C>::size_t size_t;
+ //@endcond
public:
/**
@@ -3845,6 +3864,11 @@ namespace xsd
{
}
+#ifdef XSD_CXX11
+ entities&
+ operator= (const entities&) = default;
+#endif
+
/**
* @brief Copy the instance polymorphically.
*
diff --git a/libxsd/xsd/cxx/version.hxx b/libxsd/xsd/cxx/version.hxx
index c2948c3..e69de29 100644
--- a/libxsd/xsd/cxx/version.hxx
+++ b/libxsd/xsd/cxx/version.hxx
@@ -1,27 +0,0 @@
-// file : xsd/cxx/version.hxx
-// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-#ifndef XSD_CXX_VERSION_HXX
-#define XSD_CXX_VERSION_HXX
-
-// Version format is AABBCCDD where
-//
-// AA - major version number
-// BB - minor version number
-// CC - bugfix version number
-// DD - alpha / beta (DD + 50) version number
-//
-// When DD is not 00, 1 is subtracted from AABBCC. For example:
-//
-// Version AABBCCDD
-// 2.0.0 02000000
-// 2.1.0 02010000
-// 2.1.1 02010100
-// 2.2.0.a1 02019901
-// 3.0.0.b2 02999952
-//
-
-#define XSD_STR_VERSION "4.1.0.a11"
-#define XSD_INT_VERSION 4009911L
-
-#endif // XSD_CXX_VERSION_HXX
diff --git a/libxsd/xsd/cxx/version.hxx.in b/libxsd/xsd/cxx/version.hxx.in
new file mode 100644
index 0000000..7f2e17a
--- /dev/null
+++ b/libxsd/xsd/cxx/version.hxx.in
@@ -0,0 +1,43 @@
+// file : xsd/cxx/version.hxx.in
+// license : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+#ifndef LIBXSD_VERSION // Note: using the version macro itself.
+
+// The numeric version format is AAAAABBBBBCCCCCDDDE where:
+//
+// AAAAA - major version number
+// BBBBB - minor version number
+// CCCCC - bugfix version number
+// DDD - alpha / beta (DDD + 500) version number
+// E - final (0) / snapshot (1)
+//
+// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example:
+//
+// Version AAAAABBBBBCCCCCDDDE
+//
+// 0.1.0 0000000001000000000
+// 0.1.2 0000000001000020000
+// 1.2.3 0000100002000030000
+// 2.2.0-a.1 0000200001999990010
+// 3.0.0-b.2 0000299999999995020
+// 2.2.0-a.1.z 0000200001999990011
+//
+#define LIBXSD_VERSION $libxsd.version.project_number$ULL
+#define LIBXSD_VERSION_STR "$libxsd.version.project$"
+#define LIBXSD_VERSION_ID "$libxsd.version.project_id$"
+#define LIBXSD_VERSION_FULL "$libxsd.version$"
+
+#define LIBXSD_VERSION_MAJOR $libxsd.version.major$
+#define LIBXSD_VERSION_MINOR $libxsd.version.minor$
+#define LIBXSD_VERSION_PATCH $libxsd.version.patch$
+
+#define LIBXSD_PRE_RELEASE $libxsd.version.pre_release$
+
+#define LIBXSD_SNAPSHOT $libxsd.version.snapshot_sn$ULL
+#define LIBXSD_SNAPSHOT_ID "$libxsd.version.snapshot_id$"
+
+// Note that Xerces and Expat compatibility is verified by the respective
+// parsers (see parser/xerces/elements.hxx and parser/expat/elements.hxx for
+// details).
+
+#endif // LIBXSD_VERSION
diff --git a/libxsd/xsd/cxx/xml/char-utf8.txx b/libxsd/xsd/cxx/xml/char-utf8.txx
index ba65397..a571ce9 100644
--- a/libxsd/xsd/cxx/xml/char-utf8.txx
+++ b/libxsd/xsd/cxx/xml/char-utf8.txx
@@ -115,20 +115,24 @@ namespace xsd
rs[i + 3] = C ((u | 0x80UL) & 0xBFUL);
u >>= 6;
}
+ // Fall through.
case 3:
{
rs[i + 2] = C ((u | 0x80UL) & 0xBFUL);
u >>= 6;
}
+ // Fall through.
case 2:
{
rs[i + 1] = C ((u | 0x80UL) & 0xBFUL);
u >>= 6;
}
+ // Fall through.
case 1:
{
rs[i] = C (u | first_byte_mask_[count]);
}
+ // Fall through.
}
i += count;
diff --git a/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx b/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx
index 97c9399..256f824 100644
--- a/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx
+++ b/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx
@@ -53,8 +53,11 @@ namespace xsd
unique_ptr (unique_ptr&& p): base (std::move (p)) {}
template <class T1>
unique_ptr (unique_ptr<T1>&& p): base (std::move (p)) {}
+
+#if !defined(__cplusplus) || __cplusplus < 201703L
template <class T1>
unique_ptr (std::auto_ptr<T1>&& p): base (std::move (p)) {}
+#endif
unique_ptr& operator= (unique_ptr&& p)
{