summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/all.dsw3
-rw-r--r--cpp/demo/Freeze/phonebook/Server.cpp1
-rw-r--r--cpp/demo/Freeze/phonebook/phonebookC.dsp4
-rw-r--r--cpp/demo/Freeze/phonebook/phonebookS.dsp30
-rw-r--r--cpp/src/Ice/Incoming.cpp2
-rw-r--r--cpp/src/slice2cpp/Gen.cpp2
-rw-r--r--cpp/src/slice2freeze/Main.cpp34
-rw-r--r--cpp/src/slice2freeze/slice2freeze.dsp12
8 files changed, 63 insertions, 25 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index 82fdcbab173..7a987801c2f 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -533,6 +533,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name Ice
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name slice2freeze
+ End Project Dependency
}}}
###############################################################################
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index 2fcd5385a2f..7d56e7992fc 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -33,7 +33,6 @@ static void
ignoreInterrupt()
{
SetConsoleCtrlHandler(NULL, TRUE);
- SetConsoleCtrlHandler(interruptHandler, FALSE);
}
#else
diff --git a/cpp/demo/Freeze/phonebook/phonebookC.dsp b/cpp/demo/Freeze/phonebook/phonebookC.dsp
index f5f283d8bf5..eb5f171b495 100644
--- a/cpp/demo/Freeze/phonebook/phonebookC.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookC.dsp
@@ -182,7 +182,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
set PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\slice2cpp.exe PhoneBook.ice \
+ ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -200,7 +200,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
set PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\slice2cpp.exe PhoneBook.ice \
+ ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index e290618b3c0..c1383a8eba9 100644
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -89,6 +89,10 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=.\NameIdentitiesDict.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\PhoneBook.cpp
# End Source File
# Begin Source File
@@ -109,6 +113,10 @@ SOURCE=.\Server.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=.\NameIdentitiesDict.h
+# End Source File
+# Begin Source File
+
SOURCE=.\PhoneBook.h
# End Source File
# Begin Source File
@@ -129,13 +137,14 @@ SOURCE=.\PhoneBook.ice
!IF "$(CFG)" == "phonebookS - Win32 Release"
-USERDEP__PHONE="../../../bin/slice2cpp.exe"
+USERDEP__PHONE="../../../bin/slice2cpp.exe" "../../../bin/slice2freeze.exe"
# Begin Custom Build
InputPath=.\PhoneBook.ice
BuildCmds= \
set PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\slice2cpp.exe PhoneBook.ice \
+ ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -143,17 +152,24 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
+
+"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "phonebookS - Win32 Debug"
-USERDEP__PHONE="../../../bin/slice2cpp.exe"
+USERDEP__PHONE="../../../bin/slice2cpp.exe" "../../../bin/slice2freeze.exe"
# Begin Custom Build
InputPath=.\PhoneBook.ice
BuildCmds= \
set PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\slice2cpp.exe PhoneBook.ice \
+ ..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -161,6 +177,12 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
+
+"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
# End Custom Build
!ENDIF
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 64209f0b867..d5a142ef40d 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -81,7 +81,7 @@ IceInternal::Incoming::invoke(Stream& is)
_os.write(p._prx);
return;
}
- catch(const LocalException& ex)
+ catch(const LocalException&)
{
if (locator && servant)
{
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 618cfab0c71..a2f63a4e788 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1241,7 +1241,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
}
H << sp;
- H << nl << "class " << exp1 << name << "PtrE : ";
+ H << nl << "class " << _dllExport << name << "PtrE : ";
H.useCurrentPosAsIndent();
if (bases.empty())
{
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 5e5d9d51a17..7b0e0b57bac 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -483,11 +483,13 @@ main(int argc, char* argv[])
unit->mergeModules();
unit->sort();
- for (vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
{
- if (p->length() && (*p)[p->length() - 1] != '/')
+ for (vector<string>::iterator p = includePaths.begin(); p != includePaths.end(); ++p)
{
- *p += '/';
+ if (p->length() && (*p)[p->length() - 1] != '/')
+ {
+ *p += '/';
+ }
}
}
@@ -520,9 +522,11 @@ main(int argc, char* argv[])
H << "\n#include <Ice/Stream.h>";
H << "\n#include <Freeze/DB.h>";
- for (StringList::const_iterator q = includes.begin(); q != includes.end(); ++q)
{
- H << "\n#include <" << changeInclude(*q, includePaths) << '>';
+ for (StringList::const_iterator p = includes.begin(); p != includes.end(); ++p)
+ {
+ H << "\n#include <" << changeInclude(*p, includePaths) << '>';
+ }
}
H << sp;
@@ -565,22 +569,24 @@ main(int argc, char* argv[])
C << "\n# endif";
C << "\n#endif";
- for (vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
{
- try
+ for (vector<Dict>::const_iterator p = dicts.begin(); p != dicts.end(); ++p)
{
- if (!writeDict(argv[0], unit, *p, H, C, dllExport))
+ try
{
+ if (!writeDict(argv[0], unit, *p, H, C, dllExport))
+ {
+ unit->destroy();
+ return EXIT_FAILURE;
+ }
+ }
+ catch(...)
+ {
+ cerr << argv[0] << ": unknown exception" << endl;
unit->destroy();
return EXIT_FAILURE;
}
}
- catch(...)
- {
- cerr << argv[0] << ": unknown exception" << endl;
- unit->destroy();
- return EXIT_FAILURE;
- }
}
H << "\n\n#endif\n";
diff --git a/cpp/src/slice2freeze/slice2freeze.dsp b/cpp/src/slice2freeze/slice2freeze.dsp
index bcf1bb7f55f..121436a9f2e 100644
--- a/cpp/src/slice2freeze/slice2freeze.dsp
+++ b/cpp/src/slice2freeze/slice2freeze.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /Ze /W3 /GR /GX /O2 /I "." /I "../../include" /I "../parser" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../../include" /I "../parser" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /Ze /W3 /Gm /GR /GX /Zi /Od /I "." /I "../../include" /I "../parser" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "." /I "../../include" /I "../parser" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /GZ /c
# SUBTRACT CPP /Fr
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -89,12 +89,20 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=.\GenUtil.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\Main.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\GenUtil.h
+# End Source File
# End Group
# Begin Group "Resource Files"
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 21:22:30 +0000