diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-11-08 10:11:28 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-11-08 10:11:28 +0000 |
| commit | 850001cfee7728613acb8ccfd1e8602fd4e83b24 (patch) | |
| tree | 00e6cd69fc1038a94f4366844090f43e3743a2f9 /cpp/src | |
| parent | Bug fixes (diff) | |
| download | ice-850001cfee7728613acb8ccfd1e8602fd4e83b24.tar.bz2 ice-850001cfee7728613acb8ccfd1e8602fd4e83b24.tar.xz ice-850001cfee7728613acb8ccfd1e8602fd4e83b24.zip | |
Fixes
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/IceGrid/icegridnode.dsp | 60 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/icegridregistry.dsp | 43 |
2 files changed, 14 insertions, 89 deletions
diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp index 5064742b4b4..0259813049e 100755 --- a/cpp/src/IceGrid/icegridnode.dsp +++ b/cpp/src/IceGrid/icegridnode.dsp @@ -206,11 +206,7 @@ SOURCE=.\StringApplicationDescriptorDict.cpp # End Source File
# Begin Source File
-SOURCE=.\StringProxyDict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StringStringSeqDict.cpp
+SOURCE=.\StringAdapterInfoDict.cpp
# End Source File
# Begin Source File
@@ -334,10 +330,6 @@ SOURCE=.\StringProxyDict.h # End Source File
# Begin Source File
-SOURCE=.\StringStringSeqDict.h
-# End Source File
-# Begin Source File
-
SOURCE=.\TraceLevels.h
# End Source File
# Begin Source File
@@ -397,12 +389,12 @@ SOURCE=.\dummy2.ice InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringProxyDict,string,Object*" StringProxyDict ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo" StringAdapterInfoDict --dict-index "IceGrid::StringAdapterInfoDict,replicaGroupId" ../../slice/IceGrid/Admin.ice
-"StringProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -413,12 +405,12 @@ USERDEP__DUMMY2="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib" InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringProxyDict,string,Object*" StringProxyDict ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo" StringAdapterInfoDict --dict-index "IceGrid::StringAdapterInfoDict,replicaGroupId" ../../slice/IceGrid/Admin.ice
-"StringProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -466,44 +458,6 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=.\dummy4.ice
-
-!IF "$(CFG)" == "icegridnode - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\dummy4.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringStringSeqDict,string,Ice::StringSeq" StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice
-
-"StringStringSeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringStringSeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "icegridnode - Win32 Debug"
-
-USERDEP__DUMMY4="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib"
-# Begin Custom Build
-InputPath=.\dummy4.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringStringSeqDict,string,Ice::StringSeq" StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice
-
-"StringStringSeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringStringSeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Internal.ice
!IF "$(CFG)" == "icegridnode - Win32 Release"
diff --git a/cpp/src/IceGrid/icegridregistry.dsp b/cpp/src/IceGrid/icegridregistry.dsp index f19f758fce7..4057f965528 100755 --- a/cpp/src/IceGrid/icegridregistry.dsp +++ b/cpp/src/IceGrid/icegridregistry.dsp @@ -187,11 +187,7 @@ SOURCE=.\StringApplicationDescriptorDict.cpp # End Source File
# Begin Source File
-SOURCE=.\StringProxyDict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StringStringSeqDict.cpp
+SOURCE=.\StringAdapterInfoDict.cpp
# End Source File
# Begin Source File
@@ -335,12 +331,12 @@ USERDEP__DUMMY2="..\..\bin\slice2freeze.exe" "..\..\lib\slice.lib" InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringProxyDict,string,Object*" StringProxyDict ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo" StringAdapterInfoDict --dict-index "IceGrid::StringAdapterInfoDict,replicaGroupId" ../../slice/IceGrid/Admin.ice
-"StringProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -351,12 +347,12 @@ USERDEP__DUMMY2="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib" InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringProxyDict,string,Object*" StringProxyDict ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringAdapterInfoDict,string,IceGrid::AdapterInfo" StringAdapterInfoDict --dict-index "IceGrid::StringAdapterInfoDict,replicaGroupId" ../../slice/IceGrid/Admin.ice
-"StringProxyDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-"StringProxyDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"StringAdapterInfoDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
# End Custom Build
@@ -404,31 +400,6 @@ BuildCmds= \ # End Source File
# Begin Source File
-SOURCE=.\dummy4.ice
-
-!IF "$(CFG)" == "icegridregistry - Win32 Release"
-
-!ELSEIF "$(CFG)" == "icegridregistry - Win32 Debug"
-
-USERDEP__DUMMY4="..\..\bin\slice2freeze.exe" "..\..\lib\sliced.lib"
-# Begin Custom Build
-InputPath=.\dummy4.ice
-
-BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringStringSeqDict,string,Ice::StringSeq" StringStringSeqDict ../../slice/Ice/BuiltinSequences.ice
-
-"StringStringSeqDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"StringStringSeqDict.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\Internal.ice
!IF "$(CFG)" == "icegridregistry - Win32 Release"
|