summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/slice/IcePack/Admin.ice4
-rw-r--r--cpp/slice/IceSSL/Plugin.ice14
-rw-r--r--cpp/slice/IceStorm/IceStorm.ice4
-rw-r--r--cpp/src/IcePack/Activator.ice8
-rw-r--r--cpp/src/IcePack/ActivatorI.cpp4
-rw-r--r--cpp/src/IcePack/AdminI.cpp2
-rw-r--r--cpp/src/IcePack/Internal.ice2
-rw-r--r--cpp/src/IcePack/Parser.cpp2
-rw-r--r--cpp/src/IcePack/ServerAdapterI.cpp2
-rw-r--r--cpp/src/IcePack/ServerBuilder.cpp8
-rw-r--r--cpp/src/IcePack/ServerDeployerI.cpp2
-rw-r--r--cpp/src/IcePack/ServerFactory.cpp2
-rw-r--r--cpp/src/IceStorm/Parser.cpp2
-rw-r--r--cpp/src/IceStorm/TopicI.cpp2
-rw-r--r--cpp/test/Ice/objects/AllTests.cpp206
-rw-r--r--cpp/test/Ice/objects/Test.ice16
-rw-r--r--cpp/test/Ice/objects/TestI.cpp40
17 files changed, 160 insertions, 160 deletions
diff --git a/cpp/slice/IcePack/Admin.ice b/cpp/slice/IcePack/Admin.ice
index 78de3bcdf9a..a3236a7af3d 100644
--- a/cpp/slice/IcePack/Admin.ice
+++ b/cpp/slice/IcePack/Admin.ice
@@ -274,7 +274,7 @@ struct ServerDescription
* Targets used to deploy the server.
*
**/
- Targets targets;
+ Targets theTargets;
/**
*
@@ -313,7 +313,7 @@ struct ServerDescription
* @see pwd
*
**/
- Args args;
+ Args theArgs;
/**
*
diff --git a/cpp/slice/IceSSL/Plugin.ice b/cpp/slice/IceSSL/Plugin.ice
index 509b95edbdf..32ba2b604e5 100644
--- a/cpp/slice/IceSSL/Plugin.ice
+++ b/cpp/slice/IceSSL/Plugin.ice
@@ -66,7 +66,7 @@ local interface Plugin extends Ice::Plugin
* @param contextType The <literal>Context</literal>(s) to configure.
*
**/
- void configure(ContextType contextType);
+ void configure(ContextType cType);
/**
*
@@ -92,7 +92,7 @@ local interface Plugin extends Ice::Plugin
* [configFile] may be found.
*
**/
- void loadConfig(ContextType contextType, string configFile, string certPath);
+ void loadConfig(ContextType cType, string configFile, string certPath);
/**
*
@@ -112,7 +112,7 @@ local interface Plugin extends Ice::Plugin
* @see IceSSL::CertificateVerifier
*
**/
- void setCertificateVerifier(ContextType contextType, CertificateVerifier certVerifier);
+ void setCertificateVerifier(ContextType cType, CertificateVerifier certVerifier);
/**
*
@@ -132,7 +132,7 @@ local interface Plugin extends Ice::Plugin
* DER format, to be trusted.
*
**/
- void addTrustedCertificateBase64(ContextType contextType, string certificate);
+ void addTrustedCertificateBase64(ContextType cType, string certificate);
/**
*
@@ -150,7 +150,7 @@ local interface Plugin extends Ice::Plugin
* @param certificate The certificate, in binary DER format, to be trusted.
*
**/
- void addTrustedCertificate(ContextType contextType, Ice::ByteSeq certificate);
+ void addTrustedCertificate(ContextType cType, Ice::ByteSeq certificate);
/**
*
@@ -170,7 +170,7 @@ local interface Plugin extends Ice::Plugin
* DER format.
*
**/
- void setRSAKeysBase64(ContextType contextType, string privateKey, string publicKey);
+ void setRSAKeysBase64(ContextType cType, string privateKey, string publicKey);
/**
*
@@ -188,7 +188,7 @@ local interface Plugin extends Ice::Plugin
* @param publicKey The RSA public key, in binary DER format.
*
**/
- void setRSAKeys(ContextType contextType, Ice::ByteSeq privateKey, Ice::ByteSeq publicKey);
+ void setRSAKeys(ContextType cType, Ice::ByteSeq privateKey, Ice::ByteSeq publicKey);
/**
*
diff --git a/cpp/slice/IceStorm/IceStorm.ice b/cpp/slice/IceStorm/IceStorm.ice
index 78299aa778d..400b385486f 100644
--- a/cpp/slice/IceStorm/IceStorm.ice
+++ b/cpp/slice/IceStorm/IceStorm.ice
@@ -33,7 +33,7 @@ struct LinkInfo
* The linked topic.
*
**/
- Topic* topic;
+ Topic* theTopic;
/**
*
@@ -240,7 +240,7 @@ interface TopicManager
* @see unsubscribe
*
**/
- void subscribe(QoS qos, Object* subscriber) throws NoSuchTopic;
+ void subscribe(QoS theQoS, Object* subscriber) throws NoSuchTopic;
/**
*
diff --git a/cpp/src/IcePack/Activator.ice b/cpp/src/IcePack/Activator.ice
index bf5afec6c8a..3f838297269 100644
--- a/cpp/src/IcePack/Activator.ice
+++ b/cpp/src/IcePack/Activator.ice
@@ -26,28 +26,28 @@ local interface Activator
* @param server The server to activate.
*
**/
- bool activate(Server server);
+ bool activate(Server theServer);
/**
*
* Deactivate a server.
*
**/
- void deactivate(Server server);
+ void deactivate(Server theServer);
/**
*
* Kill a server.
*
**/
- void kill(Server server);
+ void kill(Server theServer);
/**
*
* Returns the server pid.
*
**/
- int getServerPid(Server server);
+ int getServerPid(Server theServer);
/**
*
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp
index 3a6fabe53b9..8525e5eebeb 100644
--- a/cpp/src/IcePack/ActivatorI.cpp
+++ b/cpp/src/IcePack/ActivatorI.cpp
@@ -126,12 +126,12 @@ IcePack::ActivatorI::activate(const ServerPtr& server)
//
// Compute arguments.
//
- int argc = server->description.args.size() + 2;
+ int argc = server->description.theArgs.size() + 2;
char** argv = static_cast<char**>(malloc(argc * sizeof(char*)));
argv[0] = strdup(path.c_str());
unsigned int i = 0;
vector<string>::const_iterator q;
- for(q = server->description.args.begin(); q != server->description.args.end(); ++q, ++i)
+ for(q = server->description.theArgs.begin(); q != server->description.theArgs.end(); ++q, ++i)
{
argv[i + 1] = strdup(q->c_str());
}
diff --git a/cpp/src/IcePack/AdminI.cpp b/cpp/src/IcePack/AdminI.cpp
index a98bbc7fcea..c39d458b7cd 100644
--- a/cpp/src/IcePack/AdminI.cpp
+++ b/cpp/src/IcePack/AdminI.cpp
@@ -62,7 +62,7 @@ IcePack::AdminI::removeServer(const string& name, const Current&)
{
ServerDescription desc = server->getServerDescription();
- ApplicationBuilder builder(_communicator, _nodeRegistry, desc.targets);
+ ApplicationBuilder builder(_communicator, _nodeRegistry, desc.theTargets);
builder.addServer(name, desc.node, desc.descriptor, desc.path, "");
builder.undo();
}
diff --git a/cpp/src/IcePack/Internal.ice b/cpp/src/IcePack/Internal.ice
index bece60ad07a..7f45ccaa799 100644
--- a/cpp/src/IcePack/Internal.ice
+++ b/cpp/src/IcePack/Internal.ice
@@ -153,7 +153,7 @@ class ServerAdapter implements Adapter
* The adapter server.
*
**/
- Server* server;
+ Server* theServer;
/**
*
diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp
index 28e2e033597..ccea0a4f0b5 100644
--- a/cpp/src/IcePack/Parser.cpp
+++ b/cpp/src/IcePack/Parser.cpp
@@ -342,7 +342,7 @@ IcePack::Parser::describeServer(const list<string>& args)
cout << "pwd = " << desc.pwd << endl;
cout << "activation = " << (desc.activation == OnDemand ? "on-demand" : "manual");
cout << "args = ";
- copy(desc.args.begin(), desc.args.end(), ostream_iterator<string>(cout," "));
+ copy(desc.theArgs.begin(), desc.theArgs.end(), ostream_iterator<string>(cout," "));
cout << endl;
}
catch(const Exception& ex)
diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp
index cbf747f5d8a..e26e8432ecb 100644
--- a/cpp/src/IcePack/ServerAdapterI.cpp
+++ b/cpp/src/IcePack/ServerAdapterI.cpp
@@ -48,7 +48,7 @@ IcePack::ServerAdapterI::getDirectProxy(bool activate, const Ice::Current& curre
try
{
- if(server->start(OnDemand))
+ if(theServer->start(OnDemand))
{
_notified = false;
diff --git a/cpp/src/IcePack/ServerBuilder.cpp b/cpp/src/IcePack/ServerBuilder.cpp
index 72cc8061d52..c79d32889d1 100644
--- a/cpp/src/IcePack/ServerBuilder.cpp
+++ b/cpp/src/IcePack/ServerBuilder.cpp
@@ -340,7 +340,7 @@ IcePack::ServerBuilder::ServerBuilder(const NodeInfoPtr& nodeInfo,
_description.node = nodeInfo->getNode()->getName();
_description.name = p->second;
- _description.targets = targets;
+ _description.theTargets = targets;
_description.activation = OnDemand;
//
@@ -400,11 +400,11 @@ IcePack::ServerBuilder::parse(const std::string& descriptor)
for(vector<string>::reverse_iterator p = _javaOptions.rbegin(); p != _javaOptions.rend(); ++p)
{
- _description.args.insert(_description.args.begin(), *p);
+ _description.theArgs.insert(_description.theArgs.begin(), *p);
}
}
- _description.args.push_back("--Ice.Config=" + _configFile);
+ _description.theArgs.push_back("--Ice.Config=" + _configFile);
}
void
@@ -617,7 +617,7 @@ IcePack::ServerBuilder::addService(const string& name, const string& descriptor)
void
IcePack::ServerBuilder::addOption(const string& option)
{
- _description.args.push_back(option);
+ _description.theArgs.push_back(option);
}
void
diff --git a/cpp/src/IcePack/ServerDeployerI.cpp b/cpp/src/IcePack/ServerDeployerI.cpp
index 19d495733bd..7ed57ba3da5 100644
--- a/cpp/src/IcePack/ServerDeployerI.cpp
+++ b/cpp/src/IcePack/ServerDeployerI.cpp
@@ -111,7 +111,7 @@ IcePack::ServerDeployerI::remove(const string& name, const Ice::Current&)
variables["binpath"] = desc.path; // Required for parsing to succeed.
variables["libpath"] = "";
- ServerBuilder builder(_nodeInfo, variables, componentPath, desc.targets);
+ ServerBuilder builder(_nodeInfo, variables, componentPath, desc.theTargets);
//
// Parse the server deployment descriptors.
diff --git a/cpp/src/IcePack/ServerFactory.cpp b/cpp/src/IcePack/ServerFactory.cpp
index 5268c596c9e..33b91e046f6 100644
--- a/cpp/src/IcePack/ServerFactory.cpp
+++ b/cpp/src/IcePack/ServerFactory.cpp
@@ -180,7 +180,7 @@ IcePack::ServerFactory::createServerAdapter(const string& name, const ServerPrx&
{
ServerAdapterPtr adapterI = new ServerAdapterI(this, _traceLevels, _waitTime);
adapterI->name = name;
- adapterI->server = server;
+ adapterI->theServer = server;
Ice::Identity id;
id.category = "IcePackServerAdapter";
diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp
index 1f6fc2f4909..eb1c78f2a40 100644
--- a/cpp/src/IceStorm/Parser.cpp
+++ b/cpp/src/IceStorm/Parser.cpp
@@ -355,7 +355,7 @@ Parser::graph(const list<string>& _args)
for(LinkInfoSeq::const_iterator r = seq.begin(); r != seq.end(); ++r)
{
++unlinks;
- topic->unlink((*r).topic);
+ topic->unlink((*r).theTopic);
}
}
cout << "graph: " << links << " new or changed links. " << unlinks << " unlinks." << endl;
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 10fd13fe4ed..4c217117526 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -455,7 +455,7 @@ TopicI::link(const TopicPrx& topic, Ice::Int cost, const Ice::Current&)
//
LinkDB dbInfo;
dbInfo.obj = link;
- dbInfo.info.topic = topic;
+ dbInfo.info.theTopic = topic;
dbInfo.info.name = name;
dbInfo.info.cost = cost;
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index 710d9186254..e2f47974f47 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -56,16 +56,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
test(b2 != c);
test(b2 != d);
test(c != d);
- test(b1->b == b1);
- test(b1->c == 0);
- test(BPtr::dynamicCast(b1->a));
- test(BPtr::dynamicCast(b1->a)->a == b1->a);
- test(BPtr::dynamicCast(b1->a)->b == b1);
- test(CPtr::dynamicCast(BPtr::dynamicCast(b1->a)->c));
- test(CPtr::dynamicCast(BPtr::dynamicCast(b1->a)->c)->b == b1->a);
+ test(b1->theB == b1);
+ test(b1->theC == 0);
+ test(BPtr::dynamicCast(b1->theA));
+ test(BPtr::dynamicCast(b1->theA)->theA == b1->theA);
+ test(BPtr::dynamicCast(b1->theA)->theB == b1);
+ test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC));
+ test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC)->theB == b1->theA);
// More tests possible for b2 and d, but I think this is already sufficient.
- test(b2->a == b2);
- test(d->c == 0);
+ test(b2->theA == b2);
+ test(d->theC == 0);
cout << "ok" << endl;
//
@@ -73,29 +73,29 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
//
if(!collocated)
{
- BPtr::dynamicCast(b1->a)->a = 0;
- BPtr::dynamicCast(b1->a)->b = 0;
- BPtr::dynamicCast(b1->a)->c = 0;
- b1->a = 0;
- b1->b = 0;
+ BPtr::dynamicCast(b1->theA)->theA = 0;
+ BPtr::dynamicCast(b1->theA)->theB = 0;
+ BPtr::dynamicCast(b1->theA)->theC = 0;
+ b1->theA = 0;
+ b1->theB = 0;
- b2->a = 0;
- b2->b->a = 0;
- b2->b->b = 0;
- b2->c = 0;
+ b2->theA = 0;
+ b2->theB->theA = 0;
+ b2->theB->theB = 0;
+ b2->theC = 0;
- c->b->a = 0;
- c->b->b->a = 0;
- c->b->b->b = 0;
- c->b = 0;
+ c->theB->theA = 0;
+ c->theB->theB->theA = 0;
+ c->theB->theB->theB = 0;
+ c->theB = 0;
- BPtr::dynamicCast(BPtr::dynamicCast(d->a)->a)->a = 0;
- BPtr::dynamicCast(BPtr::dynamicCast(d->a)->a)->b = 0;
- BPtr::dynamicCast(d->a)->b->a = 0;
- BPtr::dynamicCast(d->a)->b->b = 0;
- d->b->a = 0;
- d->b->b = 0;
- d->b->c = 0;
+ BPtr::dynamicCast(BPtr::dynamicCast(d->theA)->theA)->theA = 0;
+ BPtr::dynamicCast(BPtr::dynamicCast(d->theA)->theA)->theB = 0;
+ BPtr::dynamicCast(d->theA)->theB->theA = 0;
+ BPtr::dynamicCast(d->theA)->theB->theB = 0;
+ d->theB->theA = 0;
+ d->theB->theB = 0;
+ d->theB->theC = 0;
}
cout << "getting B1, B2, C, and D all at once... " << flush;
@@ -113,16 +113,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
test(b2 != c);
test(b2 != d);
test(c != d);
- test(b1->a == b2);
- test(b1->b == b1);
- test(b1->c == 0);
- test(b2->a == b2);
- test(b2->b == b1);
- test(b2->c == c);
- test(c->b == b2);
- test(d->a == b1);
- test(d->b == b2);
- test(d->c == 0);
+ test(b1->theA == b2);
+ test(b1->theB == b1);
+ test(b1->theC == 0);
+ test(b2->theA == b2);
+ test(b2->theB == b1);
+ test(b2->theC == c);
+ test(c->theB == b2);
+ test(d->theA == b1);
+ test(d->theB == b2);
+ test(d->theC == 0);
cout << "ok" << endl;
//
@@ -130,14 +130,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
//
if(!collocated)
{
- b1->a = 0;
- b1->b = 0;
- b2->a = 0;
- b2->b = 0;
- b2->c = 0;
- c->b = 0;
- d->a = 0;
- d->b = 0;
+ b1->theA = 0;
+ b1->theB = 0;
+ b2->theA = 0;
+ b2->theB = 0;
+ b2->theC = 0;
+ c->theB = 0;
+ d->theA = 0;
+ d->theB = 0;
}
cout << "adding facets to B1... " << flush;
@@ -150,13 +150,13 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
cout << "ok" << endl;
cout << "checking consistency... " << flush;
- test(b1->b == b1);
- test(b1->c == 0);
- test(BPtr::dynamicCast(b1->a));
- test(BPtr::dynamicCast(b1->a)->a == b1->a);
- test(BPtr::dynamicCast(b1->a)->b == b1);
- test(CPtr::dynamicCast(BPtr::dynamicCast(b1->a)->c));
- test(CPtr::dynamicCast(BPtr::dynamicCast(b1->a)->c)->b == b1->a);
+ test(b1->theB == b1);
+ test(b1->theC == 0);
+ test(BPtr::dynamicCast(b1->theA));
+ test(BPtr::dynamicCast(b1->theA)->theA == b1->theA);
+ test(BPtr::dynamicCast(b1->theA)->theB == b1);
+ test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC));
+ test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC)->theB == b1->theA);
cout << "ok" << endl;
cout << "checking facet consistency... " << flush;
@@ -169,16 +169,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
DPtr fd = DPtr::dynamicCast(fb2->ice_findFacet("d"));
test(fd);
test(b1 == fb1);
- test(fb1->a == fb2);
- test(fb1->b == fb1);
- test(fb1->c == 0);
- test(fb2->a == fb2);
- test(fb2->b == fb1);
- test(fb2->c == fc);
- test(fc->b == fb2);
- test(fd->a == fb1);
- test(fd->b == fb2);
- test(fd->c == 0);
+ test(fb1->theA == fb2);
+ test(fb1->theB == fb1);
+ test(fb1->theC == 0);
+ test(fb2->theA == fb2);
+ test(fb2->theB == fb1);
+ test(fb2->theC == fc);
+ test(fc->theB == fb2);
+ test(fd->theA == fb1);
+ test(fd->theB == fb2);
+ test(fd->theC == 0);
cout << "ok" << endl;
//
@@ -186,17 +186,17 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
//
if(!collocated)
{
- BPtr::dynamicCast(fb1->a)->a = 0;
- BPtr::dynamicCast(fb1->a)->b = 0;
- fb1->a = 0;
- fb1->b = 0;
+ BPtr::dynamicCast(fb1->theA)->theA = 0;
+ BPtr::dynamicCast(fb1->theA)->theB = 0;
+ fb1->theA = 0;
+ fb1->theB = 0;
fb1->ice_removeAllFacets();
- fb2->a = 0;
- fb2->b = 0;
- fb2->c = 0;
- fc->b = 0;
- fd->a = 0;
- fd->b = 0;
+ fb2->theA = 0;
+ fb2->theB = 0;
+ fb2->theC = 0;
+ fc->theB = 0;
+ fd->theA = 0;
+ fd->theB = 0;
}
cout << "getting B1 with facets, and B2, C, and D all at once... " << flush;
@@ -214,16 +214,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
test(b2 != c);
test(b2 != d);
test(c != d);
- test(b1->a == b2);
- test(b1->b == b1);
- test(b1->c == 0);
- test(b2->a == b2);
- test(b2->b == b1);
- test(b2->c == c);
- test(c->b == b2);
- test(d->a == b1);
- test(d->b == b2);
- test(d->c == 0);
+ test(b1->theA == b2);
+ test(b1->theB == b1);
+ test(b1->theC == 0);
+ test(b2->theA == b2);
+ test(b2->theB == b1);
+ test(b2->theC == c);
+ test(c->theB == b2);
+ test(d->theA == b1);
+ test(d->theB == b2);
+ test(d->theC == 0);
cout << "ok" << endl;
cout << "checking facet consistency... " << flush;
@@ -239,17 +239,17 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
test(b2 == fb2);
test(c == fc);
test(d == fd);
- test(fb1->a == fb2);
- test(fb1->a == fb2);
- test(fb1->b == fb1);
- test(fb1->c == 0);
- test(fb2->a == fb2);
- test(fb2->b == fb1);
- test(fb2->c == fc);
- test(fc->b == fb2);
- test(fd->a == fb1);
- test(fd->b == fb2);
- test(fd->c == 0);
+ test(fb1->theA == fb2);
+ test(fb1->theA == fb2);
+ test(fb1->theB == fb1);
+ test(fb1->theC == 0);
+ test(fb2->theA == fb2);
+ test(fb2->theB == fb1);
+ test(fb2->theC == fc);
+ test(fc->theB == fb2);
+ test(fd->theA == fb1);
+ test(fd->theB == fb2);
+ test(fd->theC == 0);
cout << "ok" << endl;
//
@@ -257,15 +257,15 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
//
if(!collocated)
{
- fb1->a = 0;
- fb1->b = 0;
+ fb1->theA = 0;
+ fb1->theB = 0;
fb1->ice_removeAllFacets();
- fb2->a = 0;
- fb2->b = 0;
- fb2->c = 0;
- fc->b = 0;
- fd->a = 0;
- fd->b = 0;
+ fb2->theA = 0;
+ fb2->theB = 0;
+ fb2->theC = 0;
+ fc->theB = 0;
+ fd->theA = 0;
+ fd->theB = 0;
}
return initial;
diff --git a/cpp/test/Ice/objects/Test.ice b/cpp/test/Ice/objects/Test.ice
index 877b47cdae1..1e6c841d54e 100644
--- a/cpp/test/Ice/objects/Test.ice
+++ b/cpp/test/Ice/objects/Test.ice
@@ -16,25 +16,25 @@ class C;
class A
{
- B b;
- C c;
+ B theB;
+ C theC;
};
class B extends A
{
- A a;
+ A theA;
};
class C
{
- B b;
+ B theB;
};
class D
{
- A a;
- B b;
- C c;
+ A theA;
+ B theB;
+ C theC;
};
class Initial
@@ -44,7 +44,7 @@ class Initial
B getB2();
C getC();
D getD();
- void getAll(out B b1, out B b2, out C c, out D d);
+ void getAll(out B b1, out B b2, out C theC, out D theD);
void addFacetsToB1();
};
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 8c86cc9f7f1..32fe94ec157 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -18,19 +18,19 @@ InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) :
_c(new C),
_d(new D)
{
- _b1->a = _b2; // Cyclic reference to another B
- _b1->b = _b1; // Self reference.
- _b1->c = 0; // Null reference.
+ _b1->theA = _b2; // Cyclic reference to another B
+ _b1->theB = _b1; // Self reference.
+ _b1->theC = 0; // Null reference.
- _b2->a = _b2; // Self reference, using base.
- _b2->b = _b1; // Cyclic reference to another B
- _b2->c = _c; // Cyclic reference to a C.
+ _b2->theA = _b2; // Self reference, using base.
+ _b2->theB = _b1; // Cyclic reference to another B
+ _b2->theC = _c; // Cyclic reference to a C.
- _c->b = _b2; // Cyclic reference to a B.
+ _c->theB = _b2; // Cyclic reference to a B.
- _d->a = _b1; // Reference to a B.
- _d->b = _b2; // Reference to a B.
- _d->c = 0; // Reference to a C.
+ _d->theA = _b1; // Reference to a B.
+ _d->theB = _b2; // Reference to a B.
+ _d->theC = 0; // Reference to a C.
}
void
@@ -41,19 +41,19 @@ InitialI::shutdown(const Ice::Current&)
//
// Break cyclic dependencies
//
- _b1->a = 0;
- _b1->b = 0;
- _b1->c = 0;
+ _b1->theA = 0;
+ _b1->theB = 0;
+ _b1->theC = 0;
_b1->ice_removeAllFacets();
- _b2->a = 0;
- _b2->b = 0;
- _b2->c = 0;
+ _b2->theA = 0;
+ _b2->theB = 0;
+ _b2->theC = 0;
_b2->ice_removeAllFacets();
- _c->b = 0;
+ _c->theB = 0;
_c->ice_removeAllFacets();
- _d->a = 0;
- _d->b = 0;
- _d->c = 0;
+ _d->theA = 0;
+ _d->theB = 0;
+ _d->theC = 0;
_d->ice_removeAllFacets();
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 10:37:38 +0000