Validate facets in C++/Hybrid enum parser/serializer implementations

1 files changed, 14 insertions, 8 deletions

diff --git a/libxsde/xsde/cxx/serializer/validating/string-common.cxx b/libxsde/xsde/cxx/serializer/validating/string-common.cxx
index 20a1b34..c9c70b8 100644
--- a/libxsde/xsde/cxx/serializer/validating/string-common.cxx
+++ b/libxsde/xsde/cxx/serializer/validating/string-common.cxx
@@ -16,18 +16,24 @@ namespace xsde
       {
         void string_common::
         validate_facets (const char* s,
-#ifdef XSDE_STL
-                         size_t n,
-#endif
                          const string_facets::facets& f,
                          context& ctx)
         {
-#ifndef XSDE_STL
-          size_t n;
-          if (f.length_set_ || f.min_length_set_ || f.max_length_set_)
-            n = strlen (s);
-#endif
+          if (f.length_set_ ||
+              f.min_length_set_ ||
+              f.max_length_set_ ||
+              f.enum_count_ != 0)
+          {
+            validate_facets (s, strlen (s), f, ctx);
+          }
+        }
 
+        void string_common::
+        validate_facets (const char* s,
+                         size_t n,
+                         const string_facets::facets& f,
+                         context& ctx)
+        {
           if (f.length_set_ && n != f.length_)
           {
             ctx.schema_error (schema_error::length_not_equal_prescribed);