summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/freeze.dsp272
-rw-r--r--cpp/src/FreezeScript/transformdb.cpp2
2 files changed, 172 insertions, 102 deletions
diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp
index 7f09370e161..84f23004631 100644
--- a/cpp/src/Freeze/freeze.dsp
+++ b/cpp/src/Freeze/freeze.dsp
@@ -106,11 +106,11 @@ PostBuild_Cmds=copy $(OutDir)\freezed.lib ..\..\lib copy $(OutDir)\freeze20d.pdb
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=.\DB.cpp
+SOURCE=.\Catalog.cpp
# End Source File
# Begin Source File
-SOURCE=.\Exception.cpp
+SOURCE=.\CatalogData.cpp
# End Source File
# Begin Source File
@@ -122,15 +122,15 @@ SOURCE=.\ConnectionF.cpp
# End Source File
# Begin Source File
-SOURCE=.\Transaction.cpp
+SOURCE=.\ConnectionI.cpp
# End Source File
# Begin Source File
-SOURCE=.\Evictor.cpp
+SOURCE=.\DB.cpp
# End Source File
# Begin Source File
-SOURCE=.\ObjectStore.cpp
+SOURCE=.\Evictor.cpp
# End Source File
# Begin Source File
@@ -142,7 +142,11 @@ SOURCE=.\EvictorIteratorI.cpp
# End Source File
# Begin Source File
-SOURCE=.\Util.cpp
+SOURCE=.\EvictorStorage.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Exception.cpp
# End Source File
# Begin Source File
@@ -158,27 +162,31 @@ SOURCE=.\MapI.cpp
# End Source File
# Begin Source File
-SOURCE=.\ConnectionI.cpp
+SOURCE=.\ObjectStore.cpp
# End Source File
# Begin Source File
-SOURCE=.\TransactionHolder.cpp
+SOURCE=.\SharedDb.cpp
# End Source File
# Begin Source File
-SOURCE=.\TransactionI.cpp
+SOURCE=.\SharedDbEnv.cpp
# End Source File
# Begin Source File
-SOURCE=.\SharedDb.cpp
+SOURCE=.\Transaction.cpp
# End Source File
# Begin Source File
-SOURCE=.\EvictorStorage.cpp
+SOURCE=.\TransactionHolder.cpp
# End Source File
# Begin Source File
-SOURCE=.\SharedDbEnv.cpp
+SOURCE=.\TransactionI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Util.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -190,11 +198,11 @@ SOURCE=..\..\include\Freeze\Application.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\DB.h
+SOURCE=..\..\include\Freeze\Catalog.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Exception.h
+SOURCE=..\..\include\Freeze\CatalogData.h
# End Source File
# Begin Source File
@@ -206,31 +214,39 @@ SOURCE=..\..\include\Freeze\ConnectionF.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Transaction.h
+SOURCE=.\ConnectionI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\TransactionHolder.h
+SOURCE=..\..\include\Freeze\DB.h
# End Source File
# Begin Source File
-SOURCE=.\TransactionI.h
+SOURCE=..\..\include\Freeze\Evictor.h
# End Source File
# Begin Source File
-SOURCE=.\ConnectionI.h
+SOURCE=..\..\include\Freeze\EvictorF.h
# End Source File
# Begin Source File
-SOURCE=.\MapI.h
+SOURCE=.\EvictorI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Evictor.h
+SOURCE=.\EvictorIteratorI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\EvictorF.h
+SOURCE=..\..\include\Freeze\EvictorStorage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Freeze\Exception.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\Freeze\Freeze.h
# End Source File
# Begin Source File
@@ -238,39 +254,39 @@ SOURCE=..\..\include\Freeze\Index.h
# End Source File
# Begin Source File
-SOURCE=.\ObjectStore.h
+SOURCE=.\IndexI.h
# End Source File
# Begin Source File
-SOURCE=.\EvictorI.h
+SOURCE=..\..\include\Freeze\Initialize.h
# End Source File
# Begin Source File
-SOURCE=.\EvictorIteratorI.h
+SOURCE=..\..\include\Freeze\Map.h
# End Source File
# Begin Source File
-SOURCE=.\Util.h
+SOURCE=.\MapI.h
# End Source File
# Begin Source File
-SOURCE=.\IndexI.h
+SOURCE=.\ObjectStore.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Freeze.h
+SOURCE=..\..\include\Freeze\Transaction.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Initialize.h
+SOURCE=..\..\include\Freeze\TransactionHolder.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\Map.h
+SOURCE=.\TransactionI.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\Freeze\EvictorStorage.h
+SOURCE=.\Util.h
# End Source File
# End Group
# Begin Group "Resource Files"
@@ -278,84 +294,55 @@ SOURCE=..\..\include\Freeze\EvictorStorage.h
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
-SOURCE=..\..\slice\Freeze\DB.ice
+SOURCE=..\..\slice\Freeze\CatalogData.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
-USERDEP__DB_IC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
-InputPath=..\..\slice\Freeze\DB.ice
+InputPath=..\..\slice\Freeze\CatalogData.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DB.ice \
- move DB.h ..\..\include\Freeze \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/CatalogData.ice \
+ move CatalogData.h ..\..\include\Freeze \
+ ..\..\bin\slice2freeze.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice --dict Freeze::Catalog,string,Freeze::CatalogData Catalog ../../slice/Freeze/CatalogData.ice \
+ move Catalog.h ..\..\include\Freeze \
-"..\..\include\Freeze\DB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\CatalogData.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"DB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"CatalogData.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-# End Custom Build
-!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-
-USERDEP__DB_IC="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\DB.ice
-
-BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DB.ice \
- move DB.h ..\..\include\Freeze \
-
-
-"..\..\include\Freeze\DB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\Catalog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"DB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Catalog.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Freeze\Exception.ice
-
-!IF "$(CFG)" == "Freeze - Win32 Release"
+!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
-InputPath=..\..\slice\Freeze\Exception.ice
+InputPath=..\..\slice\Freeze\CatalogData.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Exception.ice \
- move Exception.h ..\..\include\Freeze \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/CatalogData.ice \
+ move CatalogData.h ..\..\include\Freeze \
+ ..\..\bin\slice2freeze.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice --dict Freeze::Catalog,string,Freeze::CatalogData Catalog ../../slice/Freeze/CatalogData.ice \
+ move Catalog.h ..\..\include\Freeze \
-"..\..\include\Freeze\Exception.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\CatalogData.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Exception.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"CatalogData.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-# End Custom Build
-!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe"
-# Begin Custom Build
-InputPath=..\..\slice\Freeze\Exception.ice
-
-BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Exception.ice \
- move Exception.h ..\..\include\Freeze \
-
-
-"..\..\include\Freeze\Exception.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\Catalog.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Exception.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"Catalog.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -368,7 +355,7 @@ SOURCE=..\..\slice\Freeze\Connection.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__CONNE="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
InputPath=..\..\slice\Freeze\Connection.ice
@@ -386,7 +373,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe"
+USERDEP__CONNE="..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Freeze\Connection.ice
@@ -411,7 +398,7 @@ SOURCE=..\..\slice\Freeze\ConnectionF.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__CONNEC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
InputPath=..\..\slice\Freeze\ConnectionF.ice
@@ -429,7 +416,7 @@ BuildCmds= \
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe"
+USERDEP__CONNEC="..\..\bin\slice2cpp.exe"
# Begin Custom Build
InputPath=..\..\slice\Freeze\ConnectionF.ice
@@ -450,41 +437,41 @@ BuildCmds= \
# End Source File
# Begin Source File
-SOURCE=..\..\slice\Freeze\Transaction.ice
+SOURCE=..\..\slice\Freeze\DB.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__DB_IC="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
-InputPath=..\..\slice\Freeze\Transaction.ice
+InputPath=..\..\slice\Freeze\DB.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Transaction.ice \
- move Transaction.h ..\..\include\Freeze \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DB.ice \
+ move DB.h ..\..\include\Freeze \
-"..\..\include\Freeze\Transaction.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\DB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Transaction.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"DB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-USERDEP__DBEXC="..\..\bin\slice2cpp.exe"
+USERDEP__DB_IC="..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
# Begin Custom Build
-InputPath=..\..\slice\Freeze\Transaction.ice
+InputPath=..\..\slice\Freeze\DB.ice
BuildCmds= \
- ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Transaction.ice \
- move Transaction.h ..\..\include\Freeze \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/DB.ice \
+ move DB.h ..\..\include\Freeze \
-"..\..\include\Freeze\Transaction.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"..\..\include\Freeze\DB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"Transaction.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"DB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -497,7 +484,7 @@ SOURCE=..\..\slice\Freeze\Evictor.ice
!IF "$(CFG)" == "Freeze - Win32 Release"
-USERDEP__EVICT="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+USERDEP__EVICT="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
# Begin Custom Build
InputPath=..\..\slice\Freeze\Evictor.ice
@@ -511,13 +498,11 @@ BuildCmds= \
"Evictor.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
-
# End Custom Build
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
-USERDEP__EVICT="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
+USERDEP__EVICT="..\..\bin\slice2freeze.exe" "..\..\bin\slice2cpp.exe" "..\..\lib\sliced.lib"
# Begin Custom Build
InputPath=..\..\slice\Freeze\Evictor.ice
@@ -531,7 +516,6 @@ BuildCmds= \
"Evictor.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
# End Custom Build
!ENDIF
@@ -613,6 +597,92 @@ BuildCmds= \
!ENDIF
# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Freeze\Exception.ice
+
+!IF "$(CFG)" == "Freeze - Win32 Release"
+
+USERDEP__EXCEP="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\Freeze\Exception.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Exception.ice \
+ move Exception.h ..\..\include\Freeze \
+
+
+"..\..\include\Freeze\Exception.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Exception.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
+
+USERDEP__EXCEP="..\..\bin\slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Freeze\Exception.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Exception.ice \
+ move Exception.h ..\..\include\Freeze \
+
+
+"..\..\include\Freeze\Exception.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Exception.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\slice\Freeze\Transaction.ice
+
+!IF "$(CFG)" == "Freeze - Win32 Release"
+
+USERDEP__TRANS="..\..\bin\slice2cpp.exe" "..\..\lib\slice.lib"
+# Begin Custom Build
+InputPath=..\..\slice\Freeze\Transaction.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Transaction.ice \
+ move Transaction.h ..\..\include\Freeze \
+
+
+"..\..\include\Freeze\Transaction.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Transaction.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
+
+USERDEP__TRANS="..\..\bin\slice2cpp.exe"
+# Begin Custom Build
+InputPath=..\..\slice\Freeze\Transaction.ice
+
+BuildCmds= \
+ ..\..\bin\slice2cpp.exe --dll-export FREEZE_API --include-dir Freeze -I../../slice ../../slice/Freeze/Transaction.ice \
+ move Transaction.h ..\..\include\Freeze \
+
+
+"..\..\include\Freeze\Transaction.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"Transaction.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
# End Group
# End Target
# End Project
diff --git a/cpp/src/FreezeScript/transformdb.cpp b/cpp/src/FreezeScript/transformdb.cpp
index 90aad88e976..8bd7fa5c45b 100644
--- a/cpp/src/FreezeScript/transformdb.cpp
+++ b/cpp/src/FreezeScript/transformdb.cpp
@@ -688,7 +688,7 @@ run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
//
Freeze::ConnectionPtr connectionNew = Freeze::createConnection(communicator, dbEnvNameNew, dbEnvNew);
txNew = connectionNew->beginTransaction();
- DbTxn* txnNew = getTxn(txNew);
+ DbTxn* txnNew = Freeze::getTxn(txNew);
if(allDb)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:34:07 +0000