summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/slice/Ice/Communicator.ice12
-rw-r--r--cpp/slice/Ice/ObjectAdapter.ice32
-rw-r--r--cpp/slice/IcePatch/IcePatch.ice4
-rw-r--r--cpp/src/IcePatch/Client.cpp20
-rw-r--r--cpp/src/IcePatch/IcePatchI.cpp4
-rw-r--r--cpp/src/IcePatch/Server.cpp8
6 files changed, 40 insertions, 40 deletions
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice
index e2f13151fb6..606127a2c27 100644
--- a/cpp/slice/Ice/Communicator.ice
+++ b/cpp/slice/Ice/Communicator.ice
@@ -271,12 +271,12 @@ local interface Communicator
*
* Set the logger for this communicator.
*
- * @param logger The logger to use for this communicator.
+ * @param log The logger to use for this communicator.
*
* @see Logger
*
**/
- void setLogger(Logger logger);
+ void setLogger(Logger log);
/**
*
@@ -289,13 +289,13 @@ local interface Communicator
* by calling the operation [ice_router] on such
* proxy.</para></note>
*
- * @param router The default router to use for this communicator.
+ * @param rtr The default router to use for this communicator.
*
* @see Router
* @see ObjectAdapter::addRouter
*
**/
- void setDefaultRouter(Router* router);
+ void setDefaultRouter(Router* rtr);
/**
*
@@ -310,13 +310,13 @@ local interface Communicator
* object adapter by calling the operation [setLocator] on such
* object adapter</para></note>
*
- * @param router The default router to use for this communicator.
+ * @param loc The default locator to use for this communicator.
*
* @see Locator
* @see ObjectAdapter::setLocator
*
**/
- void setDefaultLocator(Locator* locator);
+ void setDefaultLocator(Locator* loc);
/**
*
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index efd3030c533..e1b3ab186cc 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -112,7 +112,7 @@ local interface ObjectAdapter
*
* @param servant The Servant to add.
*
- * @param identity The identity of the &Ice; object that is
+ * @param id The identity of the &Ice; object that is
* implemented by the Servant.
*
* @return A proxy that matches the given identity and this object
@@ -123,7 +123,7 @@ local interface ObjectAdapter
* @see remove
*
**/
- Object* add(Object servant, Identity identity);
+ Object* add(Object servant, Identity id);
/**
*
@@ -148,7 +148,7 @@ local interface ObjectAdapter
*
* Remove a Servant from the object adapter's Active Servant Map.
*
- * @param identity The identity of the &Ice; object that is
+ * @param id The identity of the &Ice; object that is
* implemented by the Servant. If the Servant implements multiple
* &Ice; objects, [remove] has to be called for all such &Ice;
* objects.
@@ -158,7 +158,7 @@ local interface ObjectAdapter
* @see addWithUUID
*
**/
- void remove(Identity identity);
+ void remove(Identity id);
/**
*
@@ -254,7 +254,7 @@ local interface ObjectAdapter
* the Active Servant Map. It does not attempt to find a Servant
* by using any installed [ServantLocator].</para></note>
*
- * @param identity The identity of the &&Ice;; object for which the
+ * @param id The identity of the &&Ice;; object for which the
* Servant should be returned.
*
* @return The Servant that implements the &&Ice;; object with the
@@ -264,7 +264,7 @@ local interface ObjectAdapter
* @see proxyToServant
*
**/
- Object identityToServant(Identity identity);
+ Object identityToServant(Identity id);
/**
*
@@ -290,7 +290,7 @@ local interface ObjectAdapter
* Create a proxy that matches this object adapter and the given
* identity.
*
- * @param identity The identity for which a proxy is to be created.
+ * @param id The identity for which a proxy is to be created.
*
* @return A proxy that matches the given identity and this object
* adapter.
@@ -298,7 +298,7 @@ local interface ObjectAdapter
* @see Identity
*
**/
- Object* createProxy(Identity identity);
+ Object* createProxy(Identity id);
/**
*
@@ -310,7 +310,7 @@ local interface ObjectAdapter
* implementations. Regular user code should not attempt to use
* this operation.</para></note>
*
- * @param identity The identity for which a proxy is to be created.
+ * @param id The identity for which a proxy is to be created.
*
* @return A proxy that matches the given identity and this object
* adapter.
@@ -318,7 +318,7 @@ local interface ObjectAdapter
* @see Identity
*
**/
- Object* createDirectProxy(Identity identity);
+ Object* createDirectProxy(Identity id);
/**
*
@@ -331,7 +331,7 @@ local interface ObjectAdapter
* code should not attempt to use this operation.
* </para></note>
*
- * @param identity The identity for which a proxy is to be created.
+ * @param id The identity for which a proxy is to be created.
*
* @return A "reverse proxy" that matches the given identity and
* this object adapter.
@@ -339,7 +339,7 @@ local interface ObjectAdapter
* @see Identity
*
**/
- Object* createReverseProxy(Identity identity);
+ Object* createReverseProxy(Identity id);
/**
*
@@ -355,13 +355,13 @@ local interface ObjectAdapter
* add different routers to different object
* adapters. </para></note>
*
- * @param router The router to add to this object adapter.
+ * @param rtr The router to add to this object adapter.
*
* @see Router
* @see Communicator::setDefaultRouter
*
**/
- void addRouter(Router* router);
+ void addRouter(Router* rtr);
/**
* Set an &Ice; locator for this object adapter. By doing so, the
@@ -370,14 +370,14 @@ local interface ObjectAdapter
* with the object adapter will contain the adapter name instead
* of its endpoints.
*
- * @param locator The locator used by this object adapter.
+ * @param loc The locator used by this object adapter.
*
* @see createDirectProxy
* @see Locator
* @see LocatorRegistry
*
**/
- void setLocator(Locator* locator);
+ void setLocator(Locator* loc);
};
};
diff --git a/cpp/slice/IcePatch/IcePatch.ice b/cpp/slice/IcePatch/IcePatch.ice
index 9ddb3249a13..6030683253f 100644
--- a/cpp/slice/IcePatch/IcePatch.ice
+++ b/cpp/slice/IcePatch/IcePatch.ice
@@ -46,7 +46,7 @@ interface Directory extends File
class DirectoryDesc extends FileDesc
{
- Directory* directory;
+ Directory* dir;
};
interface Regular extends File
@@ -63,7 +63,7 @@ interface Regular extends File
class RegularDesc extends FileDesc
{
- Regular* regular;
+ Regular* reg;
};
};
diff --git a/cpp/src/IcePatch/Client.cpp b/cpp/src/IcePatch/Client.cpp
index d991b6e5ff3..19a32bd8a30 100644
--- a/cpp/src/IcePatch/Client.cpp
+++ b/cpp/src/IcePatch/Client.cpp
@@ -19,6 +19,7 @@
#ifdef _WIN32
# include <direct.h>
#endif
+#include <set>
using namespace std;
using namespace Ice;
@@ -372,15 +373,14 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
set<string> orphaned;
if(_remove)
{
- StringSeq fullDirectoryListing = readDirectory(identityToPath(dirDesc->directory->ice_getIdentity()));
- orphaned.reserve(fullDirectoryListing.size());
+ StringSeq fullDirectoryListing = readDirectory(identityToPath(dirDesc->dir->ice_getIdentity()));
for(StringSeq::const_iterator p = fullDirectoryListing.begin(); p != fullDirectoryListing.end(); ++p)
{
- orphaned.insert(*p)
+ orphaned.insert(*p);
}
}
- FileDescSeq fileDescSeq = dirDesc->directory->getContents();
+ FileDescSeq fileDescSeq = dirDesc->dir->getContents();
for(unsigned int i = 0; i < fileDescSeq.size(); ++i)
{
@@ -389,13 +389,13 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
RegularDescPtr regDesc;
if(subDirDesc)
{
- path = identityToPath(subDirDesc->directory->ice_getIdentity());
+ path = identityToPath(subDirDesc->dir->ice_getIdentity());
}
else
{
regDesc = RegularDescPtr::dynamicCast(fileDescSeq[i]);
assert(regDesc);
- path = identityToPath(regDesc->regular->ice_getIdentity());
+ path = identityToPath(regDesc->reg->ice_getIdentity());
}
if(_remove)
@@ -483,14 +483,14 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
{
case FileTypeNotExist:
{
- getRegular(regDesc->regular, progressCB);
+ getRegular(regDesc->reg, progressCB);
break;
}
case FileTypeDirectory:
{
removeRecursive(path);
- getRegular(regDesc->regular, progressCB);
+ getRegular(regDesc->reg, progressCB);
break;
}
@@ -508,7 +508,7 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
if(md5 != regDesc->md5)
{
removeRecursive(path);
- getRegular(regDesc->regular, progressCB);
+ getRegular(regDesc->reg, progressCB);
}
else
{
@@ -521,7 +521,7 @@ IcePatch::Client::patch(const DirectoryDescPtr& dirDesc, const string& indent) c
}
}
- for(StringSeq::const_iterator p = orphaned.begin(); p != orphaned.end(); ++p)
+ for(set<string>::const_iterator p = orphaned.begin(); p != orphaned.end(); ++p)
{
cout << indent << "+-" << pathToName(*p) << ": removing orphaned file" << endl;
removeRecursive(*p);
diff --git a/cpp/src/IcePatch/IcePatchI.cpp b/cpp/src/IcePatch/IcePatchI.cpp
index 5dbf5709caa..c50661455b7 100644
--- a/cpp/src/IcePatch/IcePatchI.cpp
+++ b/cpp/src/IcePatch/IcePatchI.cpp
@@ -83,7 +83,7 @@ IcePatch::DirectoryI::describe(const Current& current) const
// No mutex lock necessary.
DirectoryDescPtr desc = new DirectoryDesc;
desc->md5 = readMD5(current);
- desc->directory = DirectoryPrx::uncheckedCast(_adapter->createProxy(current.id));
+ desc->dir = DirectoryPrx::uncheckedCast(_adapter->createProxy(current.id));
return desc;
}
@@ -174,7 +174,7 @@ IcePatch::RegularI::describe(const Current& current) const
// No mutex lock necessary.
RegularDescPtr desc = new RegularDesc;
desc->md5 = readMD5(current);
- desc->regular = RegularPrx::uncheckedCast(_adapter->createProxy(current.id));
+ desc->reg = RegularPrx::uncheckedCast(_adapter->createProxy(current.id));
return desc;
}
diff --git a/cpp/src/IcePatch/Server.cpp b/cpp/src/IcePatch/Server.cpp
index 222fc7a80d6..6bc7de74198 100644
--- a/cpp/src/IcePatch/Server.cpp
+++ b/cpp/src/IcePatch/Server.cpp
@@ -185,7 +185,7 @@ IcePatch::Updater::run()
assert(top);
DirectoryDescPtr topDesc = DirectoryDescPtr::dynamicCast(top->describe());
assert(topDesc);
- cleanup(topDesc->directory->getContents());
+ cleanup(topDesc->dir->getContents());
}
catch(const FileAccessException& ex)
{
@@ -247,14 +247,14 @@ IcePatch::Updater::cleanup(const FileDescSeq& fileDescSeq)
// Force MD5 files to be created and orphaned files to be
// removed.
//
- cleanup(directoryDesc->directory->getContents());
+ cleanup(directoryDesc->dir->getContents());
//
// Call describe(), because MD5 files in subdirectories
// might have changed, resulting in a different summary
// MD5 for this directory.
//
- directoryDesc->directory->describe();
+ directoryDesc->dir->describe();
}
else
{
@@ -264,7 +264,7 @@ IcePatch::Updater::cleanup(const FileDescSeq& fileDescSeq)
//
// Force BZ2 files to be created for all regular files.
//
- regularDesc->regular->getBZ2Size();
+ regularDesc->reg->getBZ2Size();
}
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 20:23:59 +0000