[lmi-commits] [4789] Break a misbegotten dependency

[Greg Chicares]

Revision: 4789
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4789
Author:   chicares
Date:     2010-03-19 00:13:51 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Break a misbegotten dependency

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/ledger.hpp
    lmi/trunk/ledger_xml_io.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-03-18 23:16:35 UTC (rev 4788)
+++ lmi/trunk/ChangeLog 2010-03-19 00:13:51 UTC (rev 4789)
@@ -24429,3 +24429,22 @@
   Makefile.am
 Refine xml-serialization unit test for other toolchains.
 
+20100318T2230Z <address@hidden> [762]
+
+  xml_serialize.hpp
+Forbid xml serialization of plain enums: mc_enum<> types should be
+used instead (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2010-03/msg00020.html
+
+20100318T2316Z <address@hidden> [762]
+
+  configure.ac
+Use '-std=c++0x' for gcc versions that understand it (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2010-03/msg00040.html
+
+20100319T0013Z <address@hidden> [762]
+
+  ledger.hpp
+  ledger_xml_io.cpp
+Break a misbegotten dependency.
+

Modified: lmi/trunk/ledger.hpp
===================================================================
--- lmi/trunk/ledger.hpp        2010-03-18 23:16:35 UTC (rev 4788)
+++ lmi/trunk/ledger.hpp        2010-03-19 00:13:51 UTC (rev 4789)
@@ -28,7 +28,7 @@
 
 #include "mc_enum_type_enums.hpp"
 #include "so_attributes.hpp"
-#include "streamable.hpp"
+#include "xml_lmi.hpp"
 
 #include <boost/shared_ptr.hpp>
 
@@ -63,7 +63,6 @@
 class ledger_map_holder;
 
 class LMI_SO Ledger
-    :virtual public streamable
 {
   public:
     // TODO ?? It's pretty weak to use 100 as a default max length.
@@ -108,11 +107,10 @@
     unsigned int CalculateCRC() const;
     void Spew(std::ostream& os) const;
 
-    // Class 'streamable' required implementation.
-    virtual void read (xml::element const&);
-    virtual void write(xml::element&) const;
-    virtual int class_version() const;
-    virtual std::string xml_root_name() const;
+    void read (xml::element const&);
+    void write(xml::element&) const;
+    int class_version() const;
+    std::string xml_root_name() const;
 
     void write       (std::ostream& os) const;
     void write_xsl_fo(std::ostream& os) const;

Modified: lmi/trunk/ledger_xml_io.cpp
===================================================================
--- lmi/trunk/ledger_xml_io.cpp 2010-03-18 23:16:35 UTC (rev 4788)
+++ lmi/trunk/ledger_xml_io.cpp 2010-03-19 00:13:51 UTC (rev 4789)
@@ -55,11 +55,6 @@
 #include <string>
 #include <utility>
 
-void Ledger::read(xml::element const&)
-{
-    fatal_error() << "Not implemented." << LMI_FLUSH;
-}
-
 namespace
 {
 int const n = 7;
@@ -1007,7 +1002,7 @@
 {
     xml_lmi::xml_document document(xml_root_name());
     xml::element& root = document.root_node();
-    root << *this;
+    write(root);
     os << root;
 }
 
@@ -1028,7 +1023,7 @@
         scaled_ledger.AutoScale();
 
         xml_lmi::xml_document d(xml_root_name());
-        d.root_node() << scaled_ledger;
+        scaled_ledger.write(d.root_node());
 
         xslt::stylesheet z(xsl_filepath(scaled_ledger).string().c_str());
         os << z.apply(d.document());