This changes things to match Ray's Java event hierarchy change. I don't know
whether it's desirable, or breaks things, or what. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6281 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -7,12 +7,12 @@ DEFINE_STREAMABLE("com.threerings.presents.dobj.EntryAddedEvent", EntryAddedEven
|
|||||||
|
|
||||||
void EntryAddedEvent::readObject (ObjectInputStream& in)
|
void EntryAddedEvent::readObject (ObjectInputStream& in)
|
||||||
{
|
{
|
||||||
presents::dobj::NamedEvent::readObject(in);
|
presents::dobj::EntryEvent::readObject(in);
|
||||||
entry = boost::static_pointer_cast<Streamable>(in.readObject());
|
entry = boost::static_pointer_cast<Streamable>(in.readObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
void EntryAddedEvent::writeObject (ObjectOutputStream& out) const
|
void EntryAddedEvent::writeObject (ObjectOutputStream& out) const
|
||||||
{
|
{
|
||||||
presents::dobj::NamedEvent::writeObject(out);
|
presents::dobj::EntryEvent::writeObject(out);
|
||||||
out.writeObject(entry);
|
out.writeObject(entry);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,11 +6,11 @@
|
|||||||
#include "presents/streamers/StreamableStreamer.h"
|
#include "presents/streamers/StreamableStreamer.h"
|
||||||
|
|
||||||
#include "presents/Streamable.h"
|
#include "presents/Streamable.h"
|
||||||
#include "presents/dobj/NamedEvent.h"
|
#include "presents/dobj/EntryEvent.h"
|
||||||
|
|
||||||
namespace presents { namespace dobj {
|
namespace presents { namespace dobj {
|
||||||
|
|
||||||
class EntryAddedEvent : public presents::dobj::NamedEvent {
|
class EntryAddedEvent : public presents::dobj::EntryEvent {
|
||||||
public:
|
public:
|
||||||
DECLARE_STREAMABLE();
|
DECLARE_STREAMABLE();
|
||||||
|
|
||||||
|
|||||||
@@ -7,12 +7,12 @@ DEFINE_STREAMABLE("com.threerings.presents.dobj.EntryRemovedEvent", EntryRemoved
|
|||||||
|
|
||||||
void EntryRemovedEvent::readObject (ObjectInputStream& in)
|
void EntryRemovedEvent::readObject (ObjectInputStream& in)
|
||||||
{
|
{
|
||||||
presents::dobj::NamedEvent::readObject(in);
|
presents::dobj::EntryEvent::readObject(in);
|
||||||
key = boost::static_pointer_cast<Streamable>(in.readObject());
|
key = boost::static_pointer_cast<Streamable>(in.readObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
void EntryRemovedEvent::writeObject (ObjectOutputStream& out) const
|
void EntryRemovedEvent::writeObject (ObjectOutputStream& out) const
|
||||||
{
|
{
|
||||||
presents::dobj::NamedEvent::writeObject(out);
|
presents::dobj::EntryEvent::writeObject(out);
|
||||||
out.writeObject(key);
|
out.writeObject(key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,11 +6,11 @@
|
|||||||
#include "presents/streamers/StreamableStreamer.h"
|
#include "presents/streamers/StreamableStreamer.h"
|
||||||
|
|
||||||
#include "presents/Streamable.h"
|
#include "presents/Streamable.h"
|
||||||
#include "presents/dobj/NamedEvent.h"
|
#include "presents/dobj/EntryEvent.h"
|
||||||
|
|
||||||
namespace presents { namespace dobj {
|
namespace presents { namespace dobj {
|
||||||
|
|
||||||
class EntryRemovedEvent : public presents::dobj::NamedEvent {
|
class EntryRemovedEvent : public presents::dobj::EntryEvent {
|
||||||
public:
|
public:
|
||||||
DECLARE_STREAMABLE();
|
DECLARE_STREAMABLE();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user