[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [4790] Rename 'streamable.?pp' to 'xml_serializable.?pp'
From: |
Greg Chicares |
Subject: |
[lmi-commits] [4790] Rename 'streamable.?pp' to 'xml_serializable.?pp' |
Date: |
Fri, 19 Mar 2010 01:58:34 +0000 |
Revision: 4790
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4790
Author: chicares
Date: 2010-03-19 01:58:34 +0000 (Fri, 19 Mar 2010)
Log Message:
-----------
Rename 'streamable.?pp' to 'xml_serializable.?pp'
Modified Paths:
--------------
lmi/trunk/ChangeLog
lmi/trunk/Makefile.am
lmi/trunk/antediluvian_stubs.cpp
lmi/trunk/input.cpp
lmi/trunk/input.hpp
lmi/trunk/mec_input.cpp
lmi/trunk/mec_input.hpp
lmi/trunk/mec_state.cpp
lmi/trunk/mec_state.hpp
lmi/trunk/objects.make
Added Paths:
-----------
lmi/trunk/xml_serializable.cpp
lmi/trunk/xml_serializable.hpp
Removed Paths:
-------------
lmi/trunk/streamable.cpp
lmi/trunk/streamable.hpp
Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/ChangeLog 2010-03-19 01:58:34 UTC (rev 4790)
@@ -24424,9 +24424,9 @@
20100317T0137Z <address@hidden> [762]
+ Makefile.am
bcc_5_5_1.make
como_4_3_3.make
- Makefile.am
Refine xml-serialization unit test for other toolchains.
20100318T2230Z <address@hidden> [762]
@@ -24448,3 +24448,20 @@
ledger_xml_io.cpp
Break a misbegotten dependency.
+20100319T0158Z <address@hidden> [761]
+
+ Makefile.am
+ antediluvian_stubs.cpp
+ input.cpp
+ input.hpp
+ mec_input.cpp
+ mec_input.hpp
+ mec_state.cpp
+ mec_state.hpp
+ objects.make
+ streamable.cpp [expunged]
+ streamable.hpp [expunged]
+ xml_serializable.cpp [new file]
+ xml_serializable.hpp [new file]
+Rename 'streamable.?pp' to 'xml_serializable.?pp'.
+
Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/Makefile.am 2010-03-19 01:58:34 UTC (rev 4790)
@@ -282,11 +282,11 @@
rounding_rules.cpp \
sigfpe.cpp \
single_cell_document.cpp \
- streamable.cpp \
surrchg_rates.cpp \
system_command.cpp \
timer.cpp \
xml_lmi.cpp \
+ xml_serializable.cpp \
yare_input.cpp
libmain_auxiliary_common_la_SOURCES = \
@@ -610,9 +610,9 @@
path_utility.cpp \
product_names.cpp \
single_cell_document.cpp \
- streamable.cpp \
tn_range_types.cpp \
xml_lmi.cpp \
+ xml_serializable.cpp \
yare_input.cpp
test_input_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
@@ -980,7 +980,6 @@
stl_extensions.hpp \
stratified_algorithms.hpp \
stratified_charges.hpp \
- streamable.hpp \
stream_cast.hpp \
surrchg_rates.hpp \
system_command.hpp \
@@ -1006,6 +1005,7 @@
wx_workarounds.hpp \
xml_lmi_fwd.hpp \
xml_lmi.hpp \
+ xml_serializable.hpp \
xml_serialize.hpp \
yare_input.hpp \
zero.hpp
Modified: lmi/trunk/antediluvian_stubs.cpp
===================================================================
--- lmi/trunk/antediluvian_stubs.cpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/antediluvian_stubs.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -58,7 +58,7 @@
mec_state::mec_state(mec_state const&)
:obstruct_slicing<mec_state>()
- ,streamable()
+ ,xml_serializable()
,MemberSymbolTable<mec_state>()
{
}
Modified: lmi/trunk/input.cpp
===================================================================
--- lmi/trunk/input.cpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/input.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -253,7 +253,7 @@
Input::Input(Input const& z)
:obstruct_slicing<Input>()
- ,streamable()
+ ,xml_serializable()
,MvcModel()
,MemberSymbolTable<Input>()
{
Modified: lmi/trunk/input.hpp
===================================================================
--- lmi/trunk/input.hpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/input.hpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -36,9 +36,9 @@
#include "mc_enum_types.hpp"
#include "obstruct_slicing.hpp"
#include "so_attributes.hpp"
-#include "streamable.hpp"
#include "tn_range.hpp"
#include "tn_range_types.hpp"
+#include "xml_serializable.hpp"
class InputSequence;
class TDatabase;
@@ -126,7 +126,7 @@
class LMI_SO Input
:virtual private obstruct_slicing<Input>
- ,virtual public streamable
+ ,virtual public xml_serializable
,public MvcModel
,public MemberSymbolTable<Input>
,private boost::equality_comparable<Input>
@@ -169,7 +169,7 @@
(InputSequence const& s
);
- // Class 'streamable' required implementation.
+ // Class 'xml_serializable' required implementation.
virtual void read (xml::element const&);
virtual void write(xml::element&) const;
virtual int class_version() const;
Modified: lmi/trunk/mec_input.cpp
===================================================================
--- lmi/trunk/mec_input.cpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/mec_input.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -134,7 +134,7 @@
mec_input::mec_input(mec_input const& z)
:obstruct_slicing<mec_input>()
- ,streamable()
+ ,xml_serializable()
,MvcModel()
,MemberSymbolTable<mec_input>()
{
Modified: lmi/trunk/mec_input.hpp
===================================================================
--- lmi/trunk/mec_input.hpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/mec_input.hpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -36,9 +36,9 @@
#include "mc_enum_types.hpp"
#include "obstruct_slicing.hpp"
#include "so_attributes.hpp"
-#include "streamable.hpp"
#include "tn_range.hpp"
#include "tn_range_types.hpp"
+#include "xml_serializable.hpp"
class InputSequence;
class TDatabase;
@@ -74,7 +74,7 @@
class LMI_SO mec_input
:virtual private obstruct_slicing<mec_input>
- ,virtual public streamable
+ ,virtual public xml_serializable
,public MvcModel
,public MemberSymbolTable<mec_input>
,private boost::equality_comparable<mec_input>
@@ -103,7 +103,7 @@
private:
void AscribeMembers();
- // Class 'streamable' required implementation.
+ // Class 'xml_serializable' required implementation.
virtual void read (xml::element const&);
virtual void write(xml::element&) const;
virtual int class_version() const;
Modified: lmi/trunk/mec_state.cpp
===================================================================
--- lmi/trunk/mec_state.cpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/mec_state.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -73,7 +73,7 @@
mec_state::mec_state(mec_state const& z)
:obstruct_slicing<mec_state>()
- ,streamable()
+ ,xml_serializable()
,MemberSymbolTable<mec_state>()
{
AscribeMembers();
Modified: lmi/trunk/mec_state.hpp
===================================================================
--- lmi/trunk/mec_state.hpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/mec_state.hpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -29,7 +29,7 @@
#include "any_member.hpp"
#include "obstruct_slicing.hpp"
#include "so_attributes.hpp"
-#include "streamable.hpp"
+#include "xml_serializable.hpp"
#include <boost/filesystem/path.hpp>
#include <boost/operators.hpp>
@@ -49,7 +49,7 @@
class LMI_SO mec_state
:virtual private obstruct_slicing<mec_state>
- ,virtual public streamable
+ ,virtual public xml_serializable
,public MemberSymbolTable<mec_state>
,private boost::equality_comparable<mec_state>
{
@@ -69,7 +69,7 @@
private:
void AscribeMembers();
- // Class 'streamable' required implementation.
+ // Class 'xml_serializable' required implementation.
virtual void read (xml::element const&);
virtual void write(xml::element&) const;
virtual int class_version() const;
Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/objects.make 2010-03-19 01:58:34 UTC (rev 4790)
@@ -232,12 +232,12 @@
rounding_rules.o \
sigfpe.o \
single_cell_document.o \
- streamable.o \
surrchg_rates.o \
system_command.o \
timer.o \
tn_range_types.o \
xml_lmi.o \
+ xml_serializable.o \
yare_input.o \
################################################################################
@@ -418,11 +418,11 @@
rounding_rules.o \
stratified_algorithms.o \
stratified_charges.o \
- streamable.o \
surrchg_rates.o \
tn_range_types.o \
timer.o \
xml_lmi.o \
+ xml_serializable.o \
yare_input.o \
libgpt.a libgpt$(SHREXT): EXTRA_LDFLAGS =
@@ -669,10 +669,10 @@
path_utility.o \
product_names.o \
single_cell_document.o \
- streamable.o \
timer.o \
tn_range_types.o \
xml_lmi.o \
+ xml_serializable.o \
yare_input.o \
irc7702a_test$(EXEEXT): \
@@ -684,8 +684,8 @@
mec_state.o \
miscellany.o \
stratified_algorithms.o \
- streamable.o \
xml_lmi.o \
+ xml_serializable.o \
istream_to_string_test$(EXEEXT): \
$(common_test_objects) \
Deleted: lmi/trunk/streamable.cpp
===================================================================
--- lmi/trunk/streamable.cpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/streamable.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -1,34 +0,0 @@
-// Mixin for xml streaming operators.
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifdef __BORLANDC__
-# include "pchfile.hpp"
-# pragma hdrstop
-#endif // __BORLANDC__
-
-#include "streamable.hpp"
-
-streamable::~streamable()
-{
-}
-
Deleted: lmi/trunk/streamable.hpp
===================================================================
--- lmi/trunk/streamable.hpp 2010-03-19 00:13:51 UTC (rev 4789)
+++ lmi/trunk/streamable.hpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -1,61 +0,0 @@
-// Mixin for xml streaming operators.
-//
-// Copyright (C) 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2010 Gregory W.
Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#ifndef streamable_hpp
-#define streamable_hpp
-
-#include "config.hpp"
-
-#include "so_attributes.hpp"
-#include "xml_lmi_fwd.hpp"
-
-#include <string>
-
-/// TODO ?? Is this mixin class actually useful enough to perpetuate?
-
-class LMI_SO streamable
-{
- public:
- virtual ~streamable() = 0;
-
- virtual void read (xml::element const&) = 0;
- virtual void write(xml::element&) const = 0;
-
- virtual int class_version() const = 0;
- virtual std::string xml_root_name() const = 0;
-};
-
-inline xml::element const& operator>>(xml::element const& x, streamable& z)
-{
- z.read(x);
- return x;
-}
-
-inline xml::element& operator<<(xml::element& x, streamable const& z)
-{
- z.write(x);
- return x;
-}
-
-#endif // streamable_hpp
-
Added: lmi/trunk/xml_serializable.cpp
===================================================================
--- lmi/trunk/xml_serializable.cpp (rev 0)
+++ lmi/trunk/xml_serializable.cpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -0,0 +1,34 @@
+// Mixin for xml serialization.
+//
+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifdef __BORLANDC__
+# include "pchfile.hpp"
+# pragma hdrstop
+#endif // __BORLANDC__
+
+#include "xml_serializable.hpp"
+
+xml_serializable::~xml_serializable()
+{
+}
+
Property changes on: lmi/trunk/xml_serializable.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Added: lmi/trunk/xml_serializable.hpp
===================================================================
--- lmi/trunk/xml_serializable.hpp (rev 0)
+++ lmi/trunk/xml_serializable.hpp 2010-03-19 01:58:34 UTC (rev 4790)
@@ -0,0 +1,61 @@
+// Mixin for xml serialization.
+//
+// Copyright (C) 2001, 2002, 2005, 2006, 2007, 2008, 2009, 2010 Gregory W.
Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+#ifndef xml_serializable_hpp
+#define xml_serializable_hpp
+
+#include "config.hpp"
+
+#include "so_attributes.hpp"
+#include "xml_lmi_fwd.hpp"
+
+#include <string>
+
+/// Derive from this mixin class to use its xml serialization.
+
+class LMI_SO xml_serializable
+{
+ public:
+ virtual ~xml_serializable() = 0;
+
+ virtual void read (xml::element const&) = 0;
+ virtual void write(xml::element&) const = 0;
+
+ virtual int class_version() const = 0;
+ virtual std::string xml_root_name() const = 0;
+};
+
+inline xml::element const& operator>>(xml::element const& x, xml_serializable&
z)
+{
+ z.read(x);
+ return x;
+}
+
+inline xml::element& operator<<(xml::element& x, xml_serializable const& z)
+{
+ z.write(x);
+ return x;
+}
+
+#endif // xml_serializable_hpp
+
Property changes on: lmi/trunk/xml_serializable.hpp
___________________________________________________________________
Added: svn:keywords
+ Id
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [4790] Rename 'streamable.?pp' to 'xml_serializable.?pp',
Greg Chicares <=