IceStorm WIN32 updates.

4 files changed, 28 insertions, 16 deletions

diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index caf9631e323..020bdc33503 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -328,7 +328,7 @@ TopicI::TopicI(const Ice::ObjectAdapterPtr& adapter, const TraceLevelsPtr& trace
     //
     // Run through link database - re-establishing linked subscribers
     //
-    for (IdentityLinkDict::iterator p = _links.begin(); p != _links.end(); ++p)
+    for (IdentityLinkDict::const_iterator p = _links.begin(); p != _links.end(); ++p)
     {
 	if (_traceLevels->topic > 0)
 	{
diff --git a/cpp/src/IceStorm/WeightedGraph.cpp b/cpp/src/IceStorm/WeightedGraph.cpp
index eb2453ec156..17f062d7b77 100644
--- a/cpp/src/IceStorm/WeightedGraph.cpp
+++ b/cpp/src/IceStorm/WeightedGraph.cpp
@@ -59,6 +59,10 @@ public:
     }
 };
 
+#ifdef WIN32
+#    pragma warning(disable:4786)
+#endif
+
 class SAXGraphHandler : public DocumentHandler
 {
 public:
diff --git a/cpp/src/IceStorm/icestormC.dsp b/cpp/src/IceStorm/icestormC.dsp
index d7d5239add6..305baad2918 100644
--- a/cpp/src/IceStorm/icestormC.dsp
+++ b/cpp/src/IceStorm/icestormC.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # 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 /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /I "dummyinclude" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c

-# SUBTRACT CPP /Z<none> /Fr

+# SUBTRACT CPP /Fr

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 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 /subsystem:console /machine:I386

-# ADD LINK32 ws2_32.lib setargv.obj jtc.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/icestormadmin.exe" /libpath:"../../../lib"

+# ADD LINK32 ws2_32.lib setargv.obj jtc.lib xerces-c_1.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/icestormadmin.exe" /libpath:"../../../lib"

 

 !ELSEIF  "$(CFG)" == "IceStormC - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ws2_32.lib setargv.obj jtcd.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icestormadmin.exe" /pdbtype:sept /libpath:"../../../lib"

+# ADD LINK32 ws2_32.lib setargv.obj jtcd.lib xerces-c_1D.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icestormadmin.exe" /pdbtype:sept /libpath:"../../../lib"

 

 !ENDIF 

 

@@ -103,6 +103,10 @@ SOURCE=.\Parser.cpp
 

 SOURCE=.\Scanner.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\WeightedGraph.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -115,6 +119,10 @@ SOURCE=.\Grammar.h
 

 SOURCE=.\Parser.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\WeightedGraph.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp
index 8d21bb52841..ea566847e53 100644
--- a/cpp/src/IceStorm/icestormS.dsp
+++ b/cpp/src/IceStorm/icestormS.dsp
@@ -101,7 +101,7 @@ SOURCE=.\IdentityLinkDict.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\LinkInfo.cpp

+SOURCE=.\LinkDB.cpp

 # End Source File

 # Begin Source File

 

@@ -295,23 +295,23 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=.\LinkInfo.ice

+SOURCE=.\LinkDB.ice

 

 !IF  "$(CFG)" == "IceStormS - Win32 Release"

 

 # Begin Custom Build

-InputPath=.\LinkInfo.ice

+InputPath=.\LinkDB.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkInfo.ice \

-	..\..\bin\slice2freeze.exe --include-dir IceStorm  -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict ../IceStorm/LinkInfo.ice ../../slice/Ice/Identity.ice \

+	..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkDB.ice \

+	..\..\bin\slice2freeze.exe --include-dir IceStorm  -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkDB IdentityLinkDict ../IceStorm/LinkDB.ice ../../slice/Ice/Identity.ice \

 	

 

-"LinkInfo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"LinkDB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"LinkInfo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"LinkDB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

@@ -324,18 +324,18 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "IceStormS - Win32 Debug"

 

 # Begin Custom Build

-InputPath=.\LinkInfo.ice

+InputPath=.\LinkDB.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkInfo.ice \

-	..\..\bin\slice2freeze.exe --include-dir IceStorm  -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkInfo IdentityLinkDict ../IceStorm/LinkInfo.ice ../../slice/Ice/Identity.ice \

+	..\..\bin\slice2cpp.exe --include-dir IceStorm -I../../slice -I.. LinkDB.ice \

+	..\..\bin\slice2freeze.exe --include-dir IceStorm  -I../../slice -I.. --dict IceStorm::IdentityLinkDict,Ice::Identity,IceStorm::LinkDB IdentityLinkDict ../IceStorm/LinkDB.ice ../../slice/Ice/Identity.ice \

 	

 

-"LinkInfo.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"LinkDB.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"LinkInfo.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"LinkDB.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "IdentityLinkDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"