summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-10-21 21:56:09 +0000
committerBernard Normier <bernard@zeroc.com>2003-10-21 21:56:09 +0000
commit0095a013d4cbe3396425c3e9d4b5e5d7e1e18a1a (patch)
tree03523619a4e49afdf851e9982379f3b3bc322e8c /cpp
parentMinor fixes (diff)
downloadice-0095a013d4cbe3396425c3e9d4b5e5d7e1e18a1a.tar.bz2
ice-0095a013d4cbe3396425c3e9d4b5e5d7e1e18a1a.tar.xz
ice-0095a013d4cbe3396425c3e9d4b5e5d7e1e18a1a.zip
Freeze Index Windows port
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Freeze/phonebook/phonebookCOL.dsp16
-rw-r--r--cpp/demo/Freeze/phonebook/phonebookS.dsp16
-rw-r--r--cpp/src/Freeze/IndexI.cpp4
-rw-r--r--cpp/src/Freeze/freeze.dsp34
4 files changed, 45 insertions, 25 deletions
diff --git a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
index 5c5b090ffc2..e796b4770b2 100644
--- a/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookCOL.dsp
@@ -103,7 +103,7 @@ SOURCE=.\Grammar.cpp
# End Source File
# Begin Source File
-SOURCE=.\NameIdentitiesDict.cpp
+SOURCE=.\NameIndex.cpp
# End Source File
# Begin Source File
@@ -139,7 +139,7 @@ SOURCE=.\Grammar.h
# End Source File
# Begin Source File
-SOURCE=.\NameIdentitiesDict.h
+SOURCE=.\NameIndex.h
# End Source File
# Begin Source File
@@ -212,7 +212,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -221,10 +221,10 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -236,7 +236,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -245,10 +245,10 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/cpp/demo/Freeze/phonebook/phonebookS.dsp b/cpp/demo/Freeze/phonebook/phonebookS.dsp
index 81ee4fe01ca..a42a0bfe102 100644
--- a/cpp/demo/Freeze/phonebook/phonebookS.dsp
+++ b/cpp/demo/Freeze/phonebook/phonebookS.dsp
@@ -95,7 +95,7 @@ SOURCE=.\ContactFactory.cpp
# End Source File
# Begin Source File
-SOURCE=.\NameIdentitiesDict.cpp
+SOURCE=.\NameIndex.cpp
# End Source File
# Begin Source File
@@ -119,7 +119,7 @@ SOURCE=.\ContactFactory.h
# End Source File
# Begin Source File
-SOURCE=.\NameIdentitiesDict.h
+SOURCE=.\NameIndex.h
# End Source File
# Begin Source File
@@ -145,7 +145,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -154,10 +154,10 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -169,7 +169,7 @@ InputPath=.\PhoneBook.ice
BuildCmds= \
..\..\..\bin\slice2cpp.exe -I../../../slice PhoneBook.ice \
- ..\..\..\bin\slice2freeze.exe -I../../../slice --dict NameIdentitiesDict,string,Identities NameIdentitiesDict PhoneBook.ice \
+ ..\..\..\bin\slice2freeze.exe -I../../../slice --index NameIndex,Contact,name,case-insensitive NameIndex PhoneBook.ice \
"PhoneBook.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -178,10 +178,10 @@ BuildCmds= \
"PhoneBook.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"NameIdentitiesDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"NameIndex.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
diff --git a/cpp/src/Freeze/IndexI.cpp b/cpp/src/Freeze/IndexI.cpp
index 42d4e2115e3..6f8ed594301 100644
--- a/cpp/src/Freeze/IndexI.cpp
+++ b/cpp/src/Freeze/IndexI.cpp
@@ -128,7 +128,7 @@ Freeze::IndexI::untypedFindFirst(const Key& bytes, Int firstN) const
toClose->close();
break; // for (;;)
}
- catch(const DbDeadlockException& dx)
+ catch(const DbDeadlockException&)
{
if(dbc != 0)
{
@@ -221,7 +221,7 @@ Freeze::IndexI::untypedCount(const Key& bytes) const
toClose->close();
break; // for (;;)
}
- catch(const DbDeadlockException& dx)
+ catch(const DbDeadlockException&)
{
if(dbc != 0)
{
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index 7f4ed3936f3..69cbe234f0e 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -134,6 +134,22 @@ SOURCE=.\EvictorI.cpp
# End Source File
# Begin Source File
+SOURCE=.\EvictorIteratorI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Index.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\IndexI.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\MapI.cpp
# End Source File
# Begin Source File
@@ -214,35 +230,39 @@ SOURCE=..\..\include\Freeze\EvictorF.h
# End Source File
# Begin Source File
+SOURCE=..\..\include\Freeze\Index.h
+# End Source File
+# Begin Source File
+
SOURCE=.\EvictorI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Freeze.h
+SOURCE=.\EvictorIteratorI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Initialize.h
+SOURCE=.\Util.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Map.h
+SOURCE=.\IndexI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\EvictorStorage.h
+SOURCE=..\..\include\Freeze\Freeze.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Strategy.h
+SOURCE=..\..\include\Freeze\Initialize.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\StrategyF.h
+SOURCE=..\..\include\Freeze\Map.h
# End Source File
# Begin Source File
-SOURCE=.\StrategyI.h
+SOURCE=..\..\include\Freeze\EvictorStorage.h
# End Source File
# End Group
# Begin Group "Resource Files"
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:29:27 +0000