summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/IceUtil/iceutil.dsp14
-rw-r--r--cpp/src/IceXML/icexml.dsp8
-rw-r--r--cpp/src/Slice/slice.dsp10
-rw-r--r--cpp/src/slice2java/Gen.cpp29
-rw-r--r--cpp/src/slice2xsd/Gen.cpp5
5 files changed, 40 insertions, 26 deletions
diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp
index 0057e502fc6..de63136a9a4 100644
--- a/cpp/src/IceUtil/iceutil.dsp
+++ b/cpp/src/IceUtil/iceutil.dsp
@@ -25,7 +25,7 @@ CFG=IceUtil - Win32 Debug
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
@@ -52,7 +52,7 @@ RSC=rc.exe
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil001.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
@@ -84,7 +84,7 @@ PostBuild_Cmds=copy Release\iceutil001.* ..\..\lib
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil001d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
@@ -112,6 +112,10 @@ SOURCE=.\Exception.cpp
# End Source File
# Begin Source File
+SOURCE=.\OutputUtil.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\RecMutex.cpp
# End Source File
# Begin Source File
@@ -172,6 +176,10 @@ SOURCE=..\..\include\IceUtil\Mutex.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\IceUtil\OutputUtil.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\include\IceUtil\RecMutex.h
# End Source File
# Begin Source File
diff --git a/cpp/src/IceXML/icexml.dsp b/cpp/src/IceXML/icexml.dsp
index 6c08eadb5be..3153ed531f4 100644
--- a/cpp/src/IceXML/icexml.dsp
+++ b/cpp/src/IceXML/icexml.dsp
@@ -104,10 +104,6 @@ PostBuild_Cmds=copy Debug\icexml001d.* ..\..\lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\Output.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\StreamI.cpp
# End Source File
# End Group
@@ -116,10 +112,6 @@ SOURCE=.\StreamI.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\include\IceXML\Output.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\include\IceXML\StreamI.h
# End Source File
# End Group
diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp
index d042c2749d5..7ed5e4e5d0d 100644
--- a/cpp/src/Slice/slice.dsp
+++ b/cpp/src/Slice/slice.dsp
@@ -25,7 +25,7 @@ CFG=Slice - Win32 Debug
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
@@ -52,7 +52,7 @@ RSC=rc.exe
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice001.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
@@ -84,7 +84,7 @@ PostBuild_Cmds=copy Release\slice001.* ..\..\lib
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LINK32=xilink6.exe
+LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice001d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
@@ -112,10 +112,6 @@ SOURCE=.\Grammar.cpp
# End Source File
# Begin Source File
-SOURCE=.\OutputUtil.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\Parser.cpp
# End Source File
# Begin Source File
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index d4c578c163c..f2ed551fd4a 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -459,6 +459,12 @@ Slice::JavaVisitor::getArgs(const OperationPtr& op, const string& scope)
return args;
}
+static bool
+exceptionIsLocal(const ::Slice::ExceptionPtr exception)
+{
+ return exception->isLocal();
+}
+
void
Slice::JavaVisitor::writeThrowsClause(const string& scope,
const ExceptionList& throws)
@@ -467,8 +473,13 @@ Slice::JavaVisitor::writeThrowsClause(const string& scope,
// Don't include local exceptions in the throws clause
//
ExceptionList::size_type localCount = 0;
- localCount = count_if(throws.begin(), throws.end(),
- ::IceUtil::memFun(&Exception::isLocal));
+
+ //
+ // MSVC gets confused if ::IceUtil::memFun(&::Slice::Exception::isLocal)); is used
+ // hence the exceptionIsLocal function.
+ //
+ localCount = count_if(throws.begin(), throws.end(), exceptionIsLocal);
+
Output& out = output();
if (throws.size() - localCount > 0)
{
@@ -1164,8 +1175,11 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p)
throws.sort();
throws.unique();
- remove_if(throws.begin(), throws.end(),
- ::IceUtil::memFun(&Exception::isLocal));
+ //
+ // MSVC gets confused if ::IceUtil::memFun(&::Slice::Exception::isLocal)); is used
+ // hence the exceptionIsLocal function.
+ //
+ remove_if(throws.begin(), throws.end(), exceptionIsLocal);
if (!inParams.empty())
{
@@ -3061,8 +3075,11 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
throws.sort();
throws.unique();
- remove_if(throws.begin(), throws.end(),
- ::IceUtil::memFun(&Exception::isLocal));
+ //
+ // MSVC gets confused if ::IceUtil::memFun(&::Slice::Exception::isLocal)); is used
+ // hence the exceptionIsLocal function.
+ //
+ remove_if(throws.begin(), throws.end(), exceptionIsLocal);
string params = getParams(op, scope);
diff --git a/cpp/src/slice2xsd/Gen.cpp b/cpp/src/slice2xsd/Gen.cpp
index 3be35f715c9..78f0754d1b3 100644
--- a/cpp/src/slice2xsd/Gen.cpp
+++ b/cpp/src/slice2xsd/Gen.cpp
@@ -265,7 +265,8 @@ Slice::Gen::visitOperation(const OperationPtr& p)
annotate("operation");
O << se("xs:sequence");
- for (TypeStringList::const_iterator q = in.begin(); q != in.end(); ++q)
+ TypeStringList::const_iterator q;
+ for (q = in.begin(); q != in.end(); ++q)
{
O << nl << "<xs:element name=\"" << q->second << "\" type=\"";
O << toString(q->first);
@@ -291,7 +292,7 @@ Slice::Gen::visitOperation(const OperationPtr& p)
{
O << nl << "<xs:element name=\"__return\" type=\"" << toString(ret) << "\"/>";
}
- for (TypeStringList::const_iterator q = out.begin(); q != out.end(); ++q)
+ for (q = out.begin(); q != out.end(); ++q)
{
O << nl << "<xs:element name=\"" << q->second << "\" type=\"";
O << toString(q->first);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 17:18:26 +0000