Implement schema enumeration to C++ enum mapping in C++/Hybrid

3 files changed, 6 insertions, 13 deletions

diff --git a/examples/cxx/hybrid/filter/driver.cxx b/examples/cxx/hybrid/filter/driver.cxx
index 67efb60..46017ab 100644
--- a/examples/cxx/hybrid/filter/driver.cxx
+++ b/examples/cxx/hybrid/filter/driver.cxx
@@ -54,7 +54,7 @@ main (int argc, char* argv[])
     {
       cerr << "first:  " << i->first_name () << endl
            << "last:   " << i->last_name () << endl
-           << "gender: " << i->gender () << endl
+           << "gender: " << i->gender ().string () << endl
            << "age:    " << i->age () << endl
            << endl;
     }
@@ -66,9 +66,7 @@ main (int argc, char* argv[])
 
     // Initialize the filter.
     //
-    gender g;
-    g.assign ("female");
-    root_s.gender_filter (g);
+    root_s.gender_filter (gender::female);
 
     xml_schema::document_simpl doc_s (root_s, people_s.root_name ());
 
diff --git a/examples/cxx/hybrid/library/driver.cxx b/examples/cxx/hybrid/library/driver.cxx
index 5aa406e..41e3e1b 100644
--- a/examples/cxx/hybrid/library/driver.cxx
+++ b/examples/cxx/hybrid/library/driver.cxx
@@ -56,7 +56,7 @@ main (int argc, char* argv[])
     {
       cerr << "ISBN         : " << i->isbn () << endl
            << "Title        : " << i->title () << endl
-           << "Genre        : " << i->genre () << endl;
+           << "Genre        : " << i->genre ().string () << endl;
 
       for (book::author_const_iterator j = i->author ().begin ();
            j != i->author ().end ();
@@ -108,9 +108,7 @@ main (int argc, char* argv[])
       t.assign ("Dead Souls");
       b->title (t);
 
-      genre g;
-      g.assign ("philosophy");
-      b->genre (g);
+      b->genre (genre::philosophy);
 
       author a;
       a.name ("Nikolai Gogol");
diff --git a/examples/cxx/hybrid/minimal/driver.cxx b/examples/cxx/hybrid/minimal/driver.cxx
index 6573237..cb13edf 100644
--- a/examples/cxx/hybrid/minimal/driver.cxx
+++ b/examples/cxx/hybrid/minimal/driver.cxx
@@ -160,7 +160,7 @@ main (int argc, char* argv[])
     printf ("first: %s\n" "last: %s\n" "gender: %s\n" "age: %hu\n\n",
             i->first_name (),
             i->last_name (),
-            i->gender ().base_value (),
+            i->gender ().string (),
             i->age ());
   }
 
@@ -181,10 +181,7 @@ main (int argc, char* argv[])
     p->first_name (strdupx ("Joe"));
     p->last_name (strdupx ("Dirt"));
     p->age (36);
-
-    gender* g = new gender;
-    g->base_value (strdupx ("male"));
-    p->gender (g);
+    p->gender (gender::male);
 
     ps.insert (ps.begin (), p);
   }