summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules.mak2
-rw-r--r--cpp/doc/Makefile.mak2
-rwxr-xr-x[-rw-r--r--]cpp/doc/slicefiles130
-rw-r--r--cpp/src/Freeze/Makefile.mak4
-rwxr-xr-xcpp/src/slice2cpp/Gen.cpp4
-rw-r--r--cpp/src/slice2java/Gen.cpp4
6 files changed, 73 insertions, 73 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 77396126067..d6a7c586b78 100644
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -89,7 +89,7 @@ SOVERSION = 33
bindir = $(top_srcdir)\bin
libdir = $(top_srcdir)\lib
includedir = $(top_srcdir)\include
-slicedir = $(top_srcdir)\slice
+slicedir = $(top_srcdir)\..\slice
install_bindir = $(prefix)\bin
diff --git a/cpp/doc/Makefile.mak b/cpp/doc/Makefile.mak
index 78a9937d2be..42229f6d04e 100644
--- a/cpp/doc/Makefile.mak
+++ b/cpp/doc/Makefile.mak
@@ -24,7 +24,7 @@ all::
reference\index.html: $(SLICEFILES)
@$(MAKE) -nologo -f Makefile.mak clean
- $(bindir)\slice2html --ice -I..\slice --hdr=htmlHeader --indexhdr=indexHeader --indexftr=indexFooter \
+ $(bindir)\slice2html --ice -I$(slicedir) --hdr=htmlHeader --indexhdr=indexHeader --indexftr=indexFooter \
--image-dir=images --logo-url="http://www.zeroc.com" --output-dir=reference --index=3 \
--summary=120 $(SLICEFILES)
-mkdir reference\$(IMAGES)
diff --git a/cpp/doc/slicefiles b/cpp/doc/slicefiles
index 43c995e5e8d..57ecb2cfb77 100644..100755
--- a/cpp/doc/slicefiles
+++ b/cpp/doc/slicefiles
@@ -1,66 +1,66 @@
-SLICEFILES = ..\slice\Freeze\BackgroundSaveEvictor.ice \
- ..\slice\Freeze\CatalogData.ice \
- ..\slice\Freeze\Connection.ice \
- ..\slice\Freeze\ConnectionF.ice \
- ..\slice\Freeze\DB.ice \
- ..\slice\Freeze\Evictor.ice \
- ..\slice\Freeze\EvictorF.ice \
- ..\slice\Freeze\EvictorStorage.ice \
- ..\slice\Freeze\Exception.ice \
- ..\slice\Freeze\Transaction.ice \
- ..\slice\Freeze\TransactionalEvictor.ice \
- ..\slice\Glacier2\PermissionsVerifier.ice \
- ..\slice\Glacier2\PermissionsVerifierF.ice \
- ..\slice\Glacier2\Router.ice \
- ..\slice\Glacier2\RouterF.ice \
- ..\slice\Glacier2\Session.ice \
- ..\slice\Glacier2\SessionF.ice \
- ..\slice\Glacier2\SSLInfo.ice \
- ..\slice\Ice\BuiltinSequences.ice \
- ..\slice\Ice\Communicator.ice \
- ..\slice\Ice\CommunicatorF.ice \
- ..\slice\Ice\Connection.ice \
- ..\slice\Ice\ConnectionF.ice \
- ..\slice\Ice\Current.ice \
- ..\slice\Ice\Endpoint.ice \
- ..\slice\Ice\FacetMap.ice \
- ..\slice\Ice\Identity.ice \
- ..\slice\Ice\ImplicitContext.ice \
- ..\slice\Ice\ImplicitContextF.ice \
- ..\slice\Ice\LocalException.ice \
- ..\slice\Ice\Locator.ice \
- ..\slice\Ice\LocatorF.ice \
- ..\slice\Ice\Logger.ice \
- ..\slice\Ice\LoggerF.ice \
- ..\slice\Ice\ObjectAdapter.ice \
- ..\slice\Ice\ObjectAdapterF.ice \
- ..\slice\Ice\ObjectFactory.ice \
- ..\slice\Ice\ObjectFactoryF.ice \
- ..\slice\Ice\Plugin.ice \
- ..\slice\Ice\PluginF.ice \
- ..\slice\Ice\Process.ice \
- ..\slice\Ice\ProcessF.ice \
- ..\slice\Ice\Properties.ice \
- ..\slice\Ice\PropertiesF.ice \
- ..\slice\Ice\Router.ice \
- ..\slice\Ice\RouterF.ice \
- ..\slice\Ice\ServantLocator.ice \
- ..\slice\Ice\ServantLocatorF.ice \
- ..\slice\Ice\SliceChecksumDict.ice \
- ..\slice\Ice\Stats.ice \
- ..\slice\Ice\StatsF.ice \
- ..\slice\IceBox\IceBox.ice \
- ..\slice\IceGrid\Admin.ice \
- ..\slice\IceGrid\Descriptor.ice \
- ..\slice\IceGrid\Exception.ice \
- ..\slice\IceGrid\FileParser.ice \
- ..\slice\IceGrid\Locator.ice \
- ..\slice\IceGrid\Observer.ice \
- ..\slice\IceGrid\Query.ice \
- ..\slice\IceGrid\Registry.ice \
- ..\slice\IceGrid\Session.ice \
- ..\slice\IceGrid\UserAccountMapper.ice \
- ..\slice\IcePatch2\FileInfo.ice \
- ..\slice\IcePatch2\FileServer.ice \
- ..\slice\IceStorm\IceStorm.ice
+SLICEFILES = ..\..\slice\Freeze\BackgroundSaveEvictor.ice \
+ ..\..\slice\Freeze\CatalogData.ice \
+ ..\..\slice\Freeze\Connection.ice \
+ ..\..\slice\Freeze\ConnectionF.ice \
+ ..\..\slice\Freeze\DB.ice \
+ ..\..\slice\Freeze\Evictor.ice \
+ ..\..\slice\Freeze\EvictorF.ice \
+ ..\..\slice\Freeze\EvictorStorage.ice \
+ ..\..\slice\Freeze\Exception.ice \
+ ..\..\slice\Freeze\Transaction.ice \
+ ..\..\slice\Freeze\TransactionalEvictor.ice \
+ ..\..\slice\Glacier2\PermissionsVerifier.ice \
+ ..\..\slice\Glacier2\PermissionsVerifierF.ice \
+ ..\..\slice\Glacier2\Router.ice \
+ ..\..\slice\Glacier2\RouterF.ice \
+ ..\..\slice\Glacier2\Session.ice \
+ ..\..\slice\Glacier2\SessionF.ice \
+ ..\..\slice\Glacier2\SSLInfo.ice \
+ ..\..\slice\Ice\BuiltinSequences.ice \
+ ..\..\slice\Ice\Communicator.ice \
+ ..\..\slice\Ice\CommunicatorF.ice \
+ ..\..\slice\Ice\Connection.ice \
+ ..\..\slice\Ice\ConnectionF.ice \
+ ..\..\slice\Ice\Current.ice \
+ ..\..\slice\Ice\Endpoint.ice \
+ ..\..\slice\Ice\FacetMap.ice \
+ ..\..\slice\Ice\Identity.ice \
+ ..\..\slice\Ice\ImplicitContext.ice \
+ ..\..\slice\Ice\ImplicitContextF.ice \
+ ..\..\slice\Ice\LocalException.ice \
+ ..\..\slice\Ice\Locator.ice \
+ ..\..\slice\Ice\LocatorF.ice \
+ ..\..\slice\Ice\Logger.ice \
+ ..\..\slice\Ice\LoggerF.ice \
+ ..\..\slice\Ice\ObjectAdapter.ice \
+ ..\..\slice\Ice\ObjectAdapterF.ice \
+ ..\..\slice\Ice\ObjectFactory.ice \
+ ..\..\slice\Ice\ObjectFactoryF.ice \
+ ..\..\slice\Ice\Plugin.ice \
+ ..\..\slice\Ice\PluginF.ice \
+ ..\..\slice\Ice\Process.ice \
+ ..\..\slice\Ice\ProcessF.ice \
+ ..\..\slice\Ice\Properties.ice \
+ ..\..\slice\Ice\PropertiesF.ice \
+ ..\..\slice\Ice\Router.ice \
+ ..\..\slice\Ice\RouterF.ice \
+ ..\..\slice\Ice\ServantLocator.ice \
+ ..\..\slice\Ice\ServantLocatorF.ice \
+ ..\..\slice\Ice\SliceChecksumDict.ice \
+ ..\..\slice\Ice\Stats.ice \
+ ..\..\slice\Ice\StatsF.ice \
+ ..\..\slice\IceBox\IceBox.ice \
+ ..\..\slice\IceGrid\Admin.ice \
+ ..\..\slice\IceGrid\Descriptor.ice \
+ ..\..\slice\IceGrid\Exception.ice \
+ ..\..\slice\IceGrid\FileParser.ice \
+ ..\..\slice\IceGrid\Locator.ice \
+ ..\..\slice\IceGrid\Observer.ice \
+ ..\..\slice\IceGrid\Query.ice \
+ ..\..\slice\IceGrid\Registry.ice \
+ ..\..\slice\IceGrid\Session.ice \
+ ..\..\slice\IceGrid\UserAccountMapper.ice \
+ ..\..\slice\IcePatch2\FileInfo.ice \
+ ..\..\slice\IcePatch2\FileServer.ice \
+ ..\..\slice\IceStorm\IceStorm.ice
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak
index 6efc86b1d51..beb7d6a66ea 100644
--- a/cpp/src/Freeze/Makefile.mak
+++ b/cpp/src/Freeze/Makefile.mak
@@ -79,7 +79,7 @@ clean::
clean::
del /q $(DLLNAME:.dll=.*)
del /q DB.cpp $(HDIR)\DB.h
- del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
+ del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h
del /q CatalogData.cpp $(HDIR)\CatalogData.h
del /q Connection.cpp $(HDIR)\Connection.h
del /q ConnectionF.cpp $(HDIR)\ConnectionF.h
@@ -88,7 +88,7 @@ clean::
del /q Evictor.cpp $(HDIR)\Evictor.h
del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h
del /q Transaction.cpp $(HDIR)\Transaction.h
- del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
+ del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h
del /q PingObject.cpp PingObject.h
install:: all
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 2196a6953b5..7694559b5fd 100755
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2999,9 +2999,9 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
C << eb;
C << nl << "__direct.destroy();";
C << eb;
- for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
+ for(ExceptionList::const_iterator k = throws.begin(); k != throws.end(); ++k)
{
- C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)";
+ C << nl << "catch(const " << fixKwd((*k)->scoped()) << "&)";
C << sb;
C << nl << "throw;";
C << eb;
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 1b4f40edf09..64870af0e4f 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -4447,9 +4447,9 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p)
out << sb;
out << nl << "__direct.destroy();";
out << eb;
- for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t)
+ for(ExceptionList::const_iterator k = throws.begin(); k != throws.end(); ++k)
{
- string exS = getAbsolute(*t, package);
+ string exS = getAbsolute(*k, package);
out << nl << "catch(" << exS << " __ex)";
out << sb;
out << nl << "throw __ex;";
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 18:36:14 +0000