[hydra-commits] kpfleming: branch ice/skipped-slice-recovery r580 - in /ice/branches/skipped-...
SVN commits to the Hydra project
hydra-commits at lists.digium.com
Mon Apr 12 13:53:31 CDT 2010
Author: kpfleming
Date: Mon Apr 12 13:53:31 2010
New Revision: 580
URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=580
Log:
remove debugging message
fix formatting to match ZeroC style
Modified:
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/AllTests.cpp
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.h
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestI.cpp
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/AllTests.cpp
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.cpp
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.h
ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestI.cpp
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/AllTests.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/AllTests.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/AllTests.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/AllTests.cpp Mon Apr 12 13:53:31 2010
@@ -403,7 +403,6 @@
catch(const Base& b)
{
test(b.b == "UnknownDerived.b");
- cout << "ice_name is " << b.ice_name() << endl;
test(b.ice_name() == "Test::Base");
}
catch(...)
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp Mon Apr 12 13:53:31 2010
@@ -17,42 +17,42 @@
class PreserverFactory : public IceInternal::UserExceptionFactory
{
public:
- void createAndThrow() {
- throw Preserver();
- }
+ void createAndThrow() {
+ throw Preserver();
+ }
private:
- class Preserver : virtual public T
- {
- public:
- vector< ::Ice::Byte > __skippedSlices;
- void __write(IceInternal::BasicStream* stream) const
- {
- stream->writeBlob(__skippedSlices);
- T::__write(stream);
- }
- void __read(IceInternal::BasicStream* stream, bool rid)
- {
- stream->readSkippedSlicesBlob(__skippedSlices);
- T::__read(stream, rid);
- }
- void ice_throw() const
- {
- throw *this;
- }
- ~Preserver() throw() {}
- };
+ class Preserver : virtual public T
+ {
+ public:
+ vector< ::Ice::Byte > __skippedSlices;
+ void __write(IceInternal::BasicStream* stream) const
+ {
+ stream->writeBlob(__skippedSlices);
+ T::__write(stream);
+ }
+ void __read(IceInternal::BasicStream* stream, bool rid)
+ {
+ stream->readSkippedSlicesBlob(__skippedSlices);
+ T::__read(stream, rid);
+ }
+ void ice_throw() const
+ {
+ throw *this;
+ }
+ ~Preserver() throw() {}
+ };
};
TestI::TestI(const Ice::CommunicatorPtr& communicator)
{
- // the factoryTable interface is... interesting. if you add an exception factory
- // with the same name as one already in the table, it just increments the reference
- // count on the existing factory, without even comparing the factory object
- // handles to see if it is in fact the same factory being added. so for now we
- // need to explicitly remove the factory that the slice2cpp translator generated
- // before adding our own
- IceInternal::factoryTable->removeExceptionFactory("::Test::BaseUnsliceable");
- IceInternal::factoryTable->addExceptionFactory("::Test::BaseUnsliceable", new PreserverFactory<BaseUnsliceable>);
+ // the factoryTable interface is... interesting. if you add an exception factory
+ // with the same name as one already in the table, it just increments the reference
+ // count on the existing factory, without even comparing the factory object
+ // handles to see if it is in fact the same factory being added. so for now we
+ // need to explicitly remove the factory that the slice2cpp translator generated
+ // before adding our own
+ IceInternal::factoryTable->removeExceptionFactory("::Test::BaseUnsliceable");
+ IceInternal::factoryTable->addExceptionFactory("::Test::BaseUnsliceable", new PreserverFactory<BaseUnsliceable>);
}
void
@@ -201,59 +201,59 @@
void
TestI::clientUnsliceableDerivedAsBasePass_async(
- const Test::AMD_TestIntf_clientUnsliceableDerivedAsBasePassPtr&,
- const Test::ClientIntfPrx& client,
- const ::Ice::Current&)
-{
- client->unsliceableDerivedAsBase();
+ const Test::AMD_TestIntf_clientUnsliceableDerivedAsBasePassPtr&,
+ const Test::ClientIntfPrx& client,
+ const ::Ice::Current&)
+{
+ client->unsliceableDerivedAsBase();
}
void
TestI::clientBaseAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientBaseAsBaseRethrowPtr& cb,
- const Test::ClientIntfPrx& client,
- const ::Ice::Current&)
-{
- try
- {
- client->baseAsBase();
- }
- catch (const Base& ex)
- {
- cb->ice_exception(ex);
- }
+ const Test::AMD_TestIntf_clientBaseAsBaseRethrowPtr& cb,
+ const Test::ClientIntfPrx& client,
+ const ::Ice::Current&)
+{
+ try
+ {
+ client->baseAsBase();
+ }
+ catch (const Base& ex)
+ {
+ cb->ice_exception(ex);
+ }
}
void
TestI::clientUnknownDerivedAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientUnknownDerivedAsBaseRethrowPtr& cb,
- const Test::ClientIntfPrx& client,
- const ::Ice::Current&)
-{
- try
- {
- client->unknownDerivedAsBase();
- }
- catch (const Base& ex)
- {
- cb->ice_exception(ex);
- }
+ const Test::AMD_TestIntf_clientUnknownDerivedAsBaseRethrowPtr& cb,
+ const Test::ClientIntfPrx& client,
+ const ::Ice::Current&)
+{
+ try
+ {
+ client->unknownDerivedAsBase();
+ }
+ catch (const Base& ex)
+ {
+ cb->ice_exception(ex);
+ }
}
void
TestI::clientUnsliceableDerivedAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrowPtr& cb,
- const Test::ClientIntfPrx& client,
- const ::Ice::Current&)
-{
- try
- {
- client->unsliceableDerivedAsBase();
- }
- catch (const Base& ex)
- {
- cb->ice_exception(ex);
- }
+ const Test::AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrowPtr& cb,
+ const Test::ClientIntfPrx& client,
+ const ::Ice::Current&)
+{
+ try
+ {
+ client->unsliceableDerivedAsBase();
+ }
+ catch (const Base& ex)
+ {
+ cb->ice_exception(ex);
+ }
}
void
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.h?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.h (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestAMDI.h Mon Apr 12 13:53:31 2010
@@ -17,63 +17,70 @@
public:
TestI(const Ice::CommunicatorPtr&);
- virtual void baseAsBase_async(const ::Test::AMD_TestIntf_baseAsBasePtr&, const ::Ice::Current&);
-
- virtual void unknownDerivedAsBase_async(const ::Test::AMD_TestIntf_unknownDerivedAsBasePtr&, const ::Ice::Current&);
- virtual void knownDerivedAsBase_async(const ::Test::AMD_TestIntf_knownDerivedAsBasePtr&, const ::Ice::Current&);
- virtual void knownDerivedAsKnownDerived_async(const ::Test::AMD_TestIntf_knownDerivedAsKnownDerivedPtr&,
- const ::Ice::Current&);
-
- virtual void unknownIntermediateAsBase_async(const ::Test::AMD_TestIntf_unknownIntermediateAsBasePtr&,
- const ::Ice::Current&);
- virtual void knownIntermediateAsBase_async(const ::Test::AMD_TestIntf_knownIntermediateAsBasePtr&,
- const ::Ice::Current&);
- virtual void knownMostDerivedAsBase_async(const ::Test::AMD_TestIntf_knownMostDerivedAsBasePtr&,
- const ::Ice::Current&);
+ virtual void baseAsBase_async(
+ const ::Test::AMD_TestIntf_baseAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void unknownDerivedAsBase_async(
+ const ::Test::AMD_TestIntf_unknownDerivedAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void knownDerivedAsBase_async(
+ const ::Test::AMD_TestIntf_knownDerivedAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void knownDerivedAsKnownDerived_async(
+ const ::Test::AMD_TestIntf_knownDerivedAsKnownDerivedPtr&,
+ const ::Ice::Current&);
+ virtual void unknownIntermediateAsBase_async(
+ const ::Test::AMD_TestIntf_unknownIntermediateAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void knownIntermediateAsBase_async(
+ const ::Test::AMD_TestIntf_knownIntermediateAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void knownMostDerivedAsBase_async(
+ const ::Test::AMD_TestIntf_knownMostDerivedAsBasePtr&,
+ const ::Ice::Current&);
virtual void knownIntermediateAsKnownIntermediate_async(
- const ::Test::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr&,
- const ::Ice::Current&);
+ const ::Test::AMD_TestIntf_knownIntermediateAsKnownIntermediatePtr&,
+ const ::Ice::Current&);
virtual void knownMostDerivedAsKnownIntermediate_async(
- const ::Test::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr&,
- const ::Ice::Current&);
+ const ::Test::AMD_TestIntf_knownMostDerivedAsKnownIntermediatePtr&,
+ const ::Ice::Current&);
virtual void knownMostDerivedAsKnownMostDerived_async(
- const ::Test::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr&,
- const ::Ice::Current&);
-
+ const ::Test::AMD_TestIntf_knownMostDerivedAsKnownMostDerivedPtr&,
+ const ::Ice::Current&);
virtual void unknownMostDerived1AsBase_async(
- const ::Test::AMD_TestIntf_unknownMostDerived1AsBasePtr&,
- const ::Ice::Current&);
+ const ::Test::AMD_TestIntf_unknownMostDerived1AsBasePtr&,
+ const ::Ice::Current&);
virtual void unknownMostDerived1AsKnownIntermediate_async(
- const ::Test::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr&,
- const ::Ice::Current&);
+ const ::Test::AMD_TestIntf_unknownMostDerived1AsKnownIntermediatePtr&,
+ const ::Ice::Current&);
virtual void unknownMostDerived2AsBase_async(
- const ::Test::AMD_TestIntf_unknownMostDerived2AsBasePtr&,
- const ::Ice::Current&);
+ const ::Test::AMD_TestIntf_unknownMostDerived2AsBasePtr&,
+ const ::Ice::Current&);
virtual void clientBaseAsBasePass_async(
- const Test::AMD_TestIntf_clientBaseAsBasePassPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientBaseAsBasePassPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void clientUnknownDerivedAsBasePass_async(
- const Test::AMD_TestIntf_clientUnknownDerivedAsBasePassPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientUnknownDerivedAsBasePassPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void clientUnsliceableDerivedAsBasePass_async(
- const Test::AMD_TestIntf_clientUnsliceableDerivedAsBasePassPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientUnsliceableDerivedAsBasePassPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void clientBaseAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientBaseAsBaseRethrowPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientBaseAsBaseRethrowPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void clientUnknownDerivedAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientUnknownDerivedAsBaseRethrowPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientUnknownDerivedAsBaseRethrowPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void clientUnsliceableDerivedAsBaseRethrow_async(
- const Test::AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrowPtr&,
- const Test::ClientIntfPrx&,
- const ::Ice::Current&);
+ const Test::AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrowPtr&,
+ const Test::ClientIntfPrx&,
+ const ::Ice::Current&);
virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&);
};
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestI.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestI.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/exceptions/TestI.cpp Mon Apr 12 13:53:31 2010
@@ -17,42 +17,42 @@
class PreserverFactory : public IceInternal::UserExceptionFactory
{
public:
- void createAndThrow() {
- throw Preserver();
- }
+ void createAndThrow() {
+ throw Preserver();
+ }
private:
- class Preserver : virtual public T
- {
- public:
- vector< ::Ice::Byte > __skippedSlices;
- void __write(IceInternal::BasicStream* stream) const
- {
- stream->writeBlob(__skippedSlices);
- T::__write(stream);
- }
- void __read(IceInternal::BasicStream* stream, bool rid)
- {
- stream->readSkippedSlicesBlob(__skippedSlices);
- T::__read(stream, rid);
- }
- void ice_throw() const
- {
- throw *this;
- }
- ~Preserver() throw() {}
- };
+ class Preserver : virtual public T
+ {
+ public:
+ vector< ::Ice::Byte > __skippedSlices;
+ void __write(IceInternal::BasicStream* stream) const
+ {
+ stream->writeBlob(__skippedSlices);
+ T::__write(stream);
+ }
+ void __read(IceInternal::BasicStream* stream, bool rid)
+ {
+ stream->readSkippedSlicesBlob(__skippedSlices);
+ T::__read(stream, rid);
+ }
+ void ice_throw() const
+ {
+ throw *this;
+ }
+ ~Preserver() throw() {}
+ };
};
TestI::TestI(const Ice::CommunicatorPtr& communicator)
{
- // the factoryTable interface is... interesting. if you add an exception factory
- // with the same name as one already in the table, it just increments the reference
- // count on the existing factory, without even comparing the factory object
- // handles to see if it is in fact the same factory being added. so for now we
- // need to explicitly remove the factory that the slice2cpp translator generated
- // before adding our own
- IceInternal::factoryTable->removeExceptionFactory("::Test::BaseUnsliceable");
- IceInternal::factoryTable->addExceptionFactory("::Test::BaseUnsliceable", new PreserverFactory<BaseUnsliceable>);
+ // the factoryTable interface is... interesting. if you add an exception factory
+ // with the same name as one already in the table, it just increments the reference
+ // count on the existing factory, without even comparing the factory object
+ // handles to see if it is in fact the same factory being added. so for now we
+ // need to explicitly remove the factory that the slice2cpp translator generated
+ // before adding our own
+ IceInternal::factoryTable->removeExceptionFactory("::Test::BaseUnsliceable");
+ IceInternal::factoryTable->addExceptionFactory("::Test::BaseUnsliceable", new PreserverFactory<BaseUnsliceable>);
}
void
@@ -181,58 +181,58 @@
void
TestI::clientBaseAsBasePass(const ClientIntfPrx& client, const ::Ice::Current&)
{
- client->baseAsBase();
+ client->baseAsBase();
}
void
TestI::clientUnknownDerivedAsBasePass(const ClientIntfPrx& client, const ::Ice::Current&)
{
- client->unknownDerivedAsBase();
+ client->unknownDerivedAsBase();
}
void
TestI::clientUnsliceableDerivedAsBasePass(const ClientIntfPrx& client, const ::Ice::Current&)
{
- client->unsliceableDerivedAsBase();
+ client->unsliceableDerivedAsBase();
}
void
TestI::clientBaseAsBaseRethrow(const ClientIntfPrx& client, const ::Ice::Current&)
{
- try
- {
- client->baseAsBase();
- }
- catch (const Base& ex)
- {
- throw;
- }
+ try
+ {
+ client->baseAsBase();
+ }
+ catch (const Base& ex)
+ {
+ throw;
+ }
}
void
TestI::clientUnknownDerivedAsBaseRethrow(const ClientIntfPrx& client, const ::Ice::Current&)
{
- try
- {
- client->unknownDerivedAsBase();
- }
- catch (const Base& ex)
- {
- throw;
- }
+ try
+ {
+ client->unknownDerivedAsBase();
+ }
+ catch (const Base& ex)
+ {
+ throw;
+ }
}
void
TestI::clientUnsliceableDerivedAsBaseRethrow(const ClientIntfPrx& client, const ::Ice::Current&)
{
- try
- {
- client->unsliceableDerivedAsBase();
- }
- catch (const Base& ex)
- {
- throw;
- }
+ try
+ {
+ client->unsliceableDerivedAsBase();
+ }
+ catch (const Base& ex)
+ {
+ throw;
+ }
}
void
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/AllTests.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/AllTests.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/AllTests.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/AllTests.cpp Mon Apr 12 13:53:31 2010
@@ -1086,7 +1086,7 @@
CallbackPtr cb = new Callback;
test->begin_returnTest3(d1, d5,
- newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception));
+ newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception));
cb->check();
BPtr b1 = cb->rb;
@@ -1180,7 +1180,7 @@
CallbackPtr cb = new Callback;
test->begin_returnTest3(d5, d1,
- newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception));
+ newCallback_TestIntf_returnTest3(cb, &Callback::response_returnTest3, &Callback::exception));
cb->check();
BPtr b1 = cb->rb;
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.cpp Mon Apr 12 13:53:31 2010
@@ -18,31 +18,31 @@
class PreserverFactory : public Ice::ObjectFactory
{
public:
- Ice::ObjectPtr create(const string& type) {
- return new Preserver();
- }
- void destroy() {}
+ Ice::ObjectPtr create(const string& type) {
+ return new Preserver();
+ }
+ void destroy() {}
private:
- class Preserver : virtual public T
- {
- public:
- vector< ::Ice::Byte > __skippedSlices;
- void __write(IceInternal::BasicStream* stream) const
- {
- stream->writeBlob(__skippedSlices);
- T::__write(stream);
- }
- void __read(IceInternal::BasicStream* stream, bool rid)
- {
- stream->readSkippedSlicesBlob(__skippedSlices);
- T::__read(stream, rid);
- }
- };
+ class Preserver : virtual public T
+ {
+ public:
+ vector< ::Ice::Byte > __skippedSlices;
+ void __write(IceInternal::BasicStream* stream) const
+ {
+ stream->writeBlob(__skippedSlices);
+ T::__write(stream);
+ }
+ void __read(IceInternal::BasicStream* stream, bool rid)
+ {
+ stream->readSkippedSlicesBlob(__skippedSlices);
+ T::__read(stream, rid);
+ }
+ };
};
TestI::TestI(const Ice::CommunicatorPtr& communicator)
{
- communicator->addObjectFactory(new PreserverFactory<BU>, BU::ice_staticId());
+ communicator->addObjectFactory(new PreserverFactory<BU>, BU::ice_staticId());
}
void
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.h?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.h (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestAMDI.h Mon Apr 12 13:53:31 2010
@@ -19,51 +19,89 @@
TestI(const Ice::CommunicatorPtr& communicator);
- virtual void SBaseAsObject_async(const ::Test::AMD_TestIntf_SBaseAsObjectPtr&, const ::Ice::Current&);
- virtual void SBaseAsSBase_async(const ::Test::AMD_TestIntf_SBaseAsSBasePtr&, const ::Ice::Current&);
- virtual void SBSKnownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBasePtr&,
- const ::Ice::Current&);
- virtual void SBSKnownDerivedAsSBSKnownDerived_async(const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr&,
- const ::Ice::Current&);
-
- virtual void SBSUnknownDerivedAsSBase_async(const ::Test::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr&,
- const ::Ice::Current&);
-
- virtual void SUnknownAsObject_async(const ::Test::AMD_TestIntf_SUnknownAsObjectPtr&, const ::Ice::Current&);
-
- virtual void oneElementCycle_async(const ::Test::AMD_TestIntf_oneElementCyclePtr&, const ::Ice::Current&);
- virtual void twoElementCycle_async(const ::Test::AMD_TestIntf_twoElementCyclePtr&, const ::Ice::Current&);
-
- virtual void D1AsB_async(const ::Test::AMD_TestIntf_D1AsBPtr&, const ::Ice::Current&);
- virtual void D1AsD1_async(const ::Test::AMD_TestIntf_D1AsD1Ptr&, const ::Ice::Current&);
- virtual void D2AsB_async(const ::Test::AMD_TestIntf_D2AsBPtr&, const ::Ice::Current&);
-
- virtual void paramTest1_async(const ::Test::AMD_TestIntf_paramTest1Ptr&, const ::Ice::Current&);
- virtual void paramTest2_async(const ::Test::AMD_TestIntf_paramTest2Ptr&, const ::Ice::Current&);
- virtual void paramTest3_async(const ::Test::AMD_TestIntf_paramTest3Ptr&, const ::Ice::Current&);
- virtual void paramTest4_async(const ::Test::AMD_TestIntf_paramTest4Ptr&, const ::Ice::Current&);
-
- virtual void returnTest1_async(const ::Test::AMD_TestIntf_returnTest1Ptr&, const ::Ice::Current&);
- virtual void returnTest2_async(const ::Test::AMD_TestIntf_returnTest2Ptr&, const ::Ice::Current&);
- virtual void returnTest3_async(const ::Test::AMD_TestIntf_returnTest3Ptr&, const ::Test::BPtr&, const ::Test::BPtr&,
- const ::Ice::Current&);
-
- virtual void sequenceTest_async(const ::Test::AMD_TestIntf_sequenceTestPtr&,
- const ::Test::SS1Ptr&, const ::Test::SS2Ptr&, const ::Ice::Current&);
-
- virtual void dictionaryTest_async(const ::Test::AMD_TestIntf_dictionaryTestPtr&,
- const ::Test::BDict&, const ::Ice::Current&);
-
- virtual void throwBaseAsBase_async(const ::Test::AMD_TestIntf_throwBaseAsBasePtr&, const ::Ice::Current&);
- virtual void throwDerivedAsBase_async(const ::Test::AMD_TestIntf_throwDerivedAsBasePtr&, const ::Ice::Current&);
- virtual void throwDerivedAsDerived_async(const ::Test::AMD_TestIntf_throwDerivedAsDerivedPtr&,
- const ::Ice::Current&);
- virtual void throwUnknownDerivedAsBase_async(const ::Test::AMD_TestIntf_throwUnknownDerivedAsBasePtr&,
- const ::Ice::Current&);
-
- virtual void useForward_async(const ::Test::AMD_TestIntf_useForwardPtr&, const ::Ice::Current&);
-
- virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&);
+ virtual void SBaseAsObject_async(
+ const ::Test::AMD_TestIntf_SBaseAsObjectPtr&,
+ const ::Ice::Current&);
+ virtual void SBaseAsSBase_async(
+ const ::Test::AMD_TestIntf_SBaseAsSBasePtr&,
+ const ::Ice::Current&);
+ virtual void SBSKnownDerivedAsSBase_async(
+ const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBasePtr&,
+ const ::Ice::Current&);
+ virtual void SBSKnownDerivedAsSBSKnownDerived_async(
+ const ::Test::AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerivedPtr&,
+ const ::Ice::Current&);
+ virtual void SBSUnknownDerivedAsSBase_async(
+ const ::Test::AMD_TestIntf_SBSUnknownDerivedAsSBasePtr&,
+ const ::Ice::Current&);
+ virtual void SUnknownAsObject_async(
+ const ::Test::AMD_TestIntf_SUnknownAsObjectPtr&,
+ const ::Ice::Current&);
+ virtual void oneElementCycle_async(
+ const ::Test::AMD_TestIntf_oneElementCyclePtr&,
+ const ::Ice::Current&);
+ virtual void twoElementCycle_async(
+ const ::Test::AMD_TestIntf_twoElementCyclePtr&,
+ const ::Ice::Current&);
+ virtual void D1AsB_async(
+ const ::Test::AMD_TestIntf_D1AsBPtr&,
+ const ::Ice::Current&);
+ virtual void D1AsD1_async(
+ const ::Test::AMD_TestIntf_D1AsD1Ptr&,
+ const ::Ice::Current&);
+ virtual void D2AsB_async(
+ const ::Test::AMD_TestIntf_D2AsBPtr&,
+ const ::Ice::Current&);
+ virtual void paramTest1_async(
+ const ::Test::AMD_TestIntf_paramTest1Ptr&,
+ const ::Ice::Current&);
+ virtual void paramTest2_async(
+ const ::Test::AMD_TestIntf_paramTest2Ptr&,
+ const ::Ice::Current&);
+ virtual void paramTest3_async(
+ const ::Test::AMD_TestIntf_paramTest3Ptr&,
+ const ::Ice::Current&);
+ virtual void paramTest4_async(
+ const ::Test::AMD_TestIntf_paramTest4Ptr&,
+ const ::Ice::Current&);
+ virtual void returnTest1_async(
+ const ::Test::AMD_TestIntf_returnTest1Ptr&,
+ const ::Ice::Current&);
+ virtual void returnTest2_async(
+ const ::Test::AMD_TestIntf_returnTest2Ptr&,
+ const ::Ice::Current&);
+ virtual void returnTest3_async(
+ const ::Test::AMD_TestIntf_returnTest3Ptr&,
+ const ::Test::BPtr&,
+ const ::Test::BPtr&,
+ const ::Ice::Current&);
+ virtual void sequenceTest_async(
+ const ::Test::AMD_TestIntf_sequenceTestPtr&,
+ const ::Test::SS1Ptr&,
+ const ::Test::SS2Ptr&,
+ const ::Ice::Current&);
+ virtual void dictionaryTest_async(
+ const ::Test::AMD_TestIntf_dictionaryTestPtr&,
+ const ::Test::BDict&,
+ const ::Ice::Current&);
+ virtual void throwBaseAsBase_async(
+ const ::Test::AMD_TestIntf_throwBaseAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void throwDerivedAsBase_async(
+ const ::Test::AMD_TestIntf_throwDerivedAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void throwDerivedAsDerived_async(
+ const ::Test::AMD_TestIntf_throwDerivedAsDerivedPtr&,
+ const ::Ice::Current&);
+ virtual void throwUnknownDerivedAsBase_async(
+ const ::Test::AMD_TestIntf_throwUnknownDerivedAsBasePtr&,
+ const ::Ice::Current&);
+ virtual void useForward_async(
+ const ::Test::AMD_TestIntf_useForwardPtr&,
+ const ::Ice::Current&);
+ virtual void shutdown_async(
+ const ::Test::AMD_TestIntf_shutdownPtr&,
+ const ::Ice::Current&);
};
#endif
Modified: ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestI.cpp?view=diff&rev=580&r1=579&r2=580
==============================================================================
--- ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestI.cpp (original)
+++ ice/branches/skipped-slice-recovery/cpp/test/Ice/slicing/objects/TestI.cpp Mon Apr 12 13:53:31 2010
@@ -18,31 +18,31 @@
class PreserverFactory : public Ice::ObjectFactory
{
public:
- Ice::ObjectPtr create(const string& type) {
- return new Preserver();
- }
- void destroy() {}
+ Ice::ObjectPtr create(const string& type) {
+ return new Preserver();
+ }
+ void destroy() {}
private:
- class Preserver : virtual public T
- {
- public:
- vector< ::Ice::Byte > __skippedSlices;
- void __write(IceInternal::BasicStream* stream) const
- {
- stream->writeBlob(__skippedSlices);
- T::__write(stream);
- }
- void __read(IceInternal::BasicStream* stream, bool rid)
- {
- stream->readSkippedSlicesBlob(__skippedSlices);
- T::__read(stream, rid);
- }
- };
+ class Preserver : virtual public T
+ {
+ public:
+ vector< ::Ice::Byte > __skippedSlices;
+ void __write(IceInternal::BasicStream* stream) const
+ {
+ stream->writeBlob(__skippedSlices);
+ T::__write(stream);
+ }
+ void __read(IceInternal::BasicStream* stream, bool rid)
+ {
+ stream->readSkippedSlicesBlob(__skippedSlices);
+ T::__read(stream, rid);
+ }
+ };
};
TestI::TestI(const Ice::CommunicatorPtr& communicator)
{
- communicator->addObjectFactory(new PreserverFactory<BU>, BU::ice_staticId());
+ communicator->addObjectFactory(new PreserverFactory<BU>, BU::ice_staticId());
}
Ice::ObjectPtr
More information about the asterisk-scf-commits
mailing list