summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-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
11 files changed, 18 insertions, 18 deletions
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;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 19:32:52 +0000