diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Application.h | 21 | ||||
| -rw-r--r-- | cpp/slice/Freeze/Evictor.ice | 16 | ||||
| -rw-r--r-- | cpp/slice/Ice/Communicator.ice | 2 | ||||
| -rw-r--r-- | cpp/slice/Ice/ObjectAdapter.ice | 6 |
4 files changed, 24 insertions, 21 deletions
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 90ddaf7f413..8550ded76f3 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -16,8 +16,9 @@ #define ICE_APPLICATION_H #include <Ice/Ice.h> + #ifndef _WIN32 -#include <csignal> +# include <csignal> #endif namespace Ice @@ -74,20 +75,22 @@ public: // // These methods can be used to temporarily block a signal and - // arrange for delivery of a pending signal later. Any signal - // that is received after holdInterrupt() was called is remember - // and delivered when releaseInterupt() is called. That signal - // is then handled according to the signal disposition established - // with shutdownOnInterrupt(), ignoreInterrupt(), or defaultInterrupt(). + // arrange for delivery of a pending signal later. Any signal that + // is received after holdInterrupt() was called is remember and + // delivered when releaseInterupt() is called. That signal is then + // handled according to the signal disposition established with + // shutdownOnInterrupt(), ignoreInterrupt(), or + // defaultInterrupt(). // static void holdInterrupt(); static void releaseInterrupt(); // // This method returns true if a signal handler was triggered, - // false otherwise. This can be used once Communicator::waitForShutdown() - // returns to test whether the shutdown was due to an interrupt (interrupted() - // returns true in that case) or because Communicator::shutdown() was called + // false otherwise. This can be used once + // Communicator::waitForShutdown() returns to test whether the + // shutdown was due to an interrupt (interrupted() returns true in + // that case) or because Communicator::shutdown() was called // (interupted() returns false in that case). // static bool interrupted(); diff --git a/cpp/slice/Freeze/Evictor.ice b/cpp/slice/Freeze/Evictor.ice index c4cbab9e513..f2ffe7cd842 100644 --- a/cpp/slice/Freeze/Evictor.ice +++ b/cpp/slice/Freeze/Evictor.ice @@ -43,7 +43,7 @@ local interface ServantInitializer * * @param adapter The ObjectAdapter the Evictor is installed with. * - * @param identity The identity of the &&Ice;; object for which the + * @param identity The identity of the &Ice; object for which the * Servant was created. * * @param servant The Servant to set up. @@ -118,7 +118,7 @@ local exception EvictorDeactivatedException /** * - * A semi-automatic &&Ice;; object persistence manager, based on the + * A semi-automatic &Ice; object persistence manager, based on the * evictor pattern. The Evictor is an extended Servant Locator, with * an implementation in the Freeze module. Instances of this * implementation can be created with the operation @@ -188,13 +188,13 @@ local interface Evictor extends Ice::ServantLocator /** * - * Create a new &&Ice;; object for this Evictor. The state of the + * Create a new &Ice; object for this Evictor. The state of the * initial Servant passed to this operation is put into the * Evictor's persistent store. * - * @param identity The identity of the &&Ice;; object to create. + * @param identity The identity of the &Ice; object to create. * - * @param servant The initial Servant for the &&Ice;; object to + * @param servant The initial Servant for the &Ice; object to * create. * * @throws DBException Raised if a database failure occurred. @@ -210,12 +210,12 @@ local interface Evictor extends Ice::ServantLocator /** * - * Permanently destroy an &&Ice;; object by removing it from this + * Permanently destroy an &Ice; object by removing it from this * Evictor's persistent store. Furthermore, if the Evictor - * currently holds a Servant for the &&Ice;; object, such Servant will + * currently holds a Servant for the &Ice; object, such Servant will * be removed. * - * @param identity The identity of the &&Ice;; object to destroy. + * @param identity The identity of the &Ice; object to destroy. * * @throws DBException Raised if a database failure occurred. * diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice index 88771e4900c..4a756a8f970 100644 --- a/cpp/slice/Ice/Communicator.ice +++ b/cpp/slice/Ice/Communicator.ice @@ -105,7 +105,7 @@ local interface Communicator * * Convert a string into a proxy. For example, * <literal>MyCategory/MyObject:tcp -h some_host -p - * 10000</literal> creates a proxy that refers to the &&Ice;; object + * 10000</literal> creates a proxy that refers to the &Ice; object * having an identity with a name "MyObject" and a category * "MyCategory", with the server running on host "some_host", port * 10000. diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index a0b3fb0a881..9658a48462d 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -252,16 +252,16 @@ local interface ObjectAdapter /** * * Look up a Servant in this object adapter's Active Servant Map - * by the identity of the &&Ice;; object it implements. + * by the identity of the &Ice; object it implements. * * <note><para>This operation only tries to lookup a Servant in * the Active Servant Map. It does not attempt to find a Servant * by using any installed [ServantLocator].</para></note> * - * @param id 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 + * @return The Servant that implements the &Ice; object with the * given identity, or null if no such Servant has been found. * * @see Identity |