removed RequestQueue; bison fix

7 files changed, 2 insertions, 129 deletions

diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index 95858b9ff15..92cce94c798 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -42,7 +42,6 @@ OBJS		= Initialize.o \
 		  ObjectAdapterI.o \
 		  ObjectAdapterFactory.o \
 		  ServantLocator.o \
-		  RequestQueue.o \
 		  UserExceptionFactory.o \
 		  UserExceptionFactoryManager.o \
 		  Endpoint.o \
@@ -288,23 +287,6 @@ $(HDIR)/ServantLocatorF.h: $(SDIR)/ServantLocatorF.ice $(SLICE2CPP)
 clean::
 	rm -f $(HDIR)/ServantLocatorF.h
 
-$(HDIR)/RequestQueue.h RequestQueue.cpp: $(SDIR)/RequestQueue.ice $(SLICE2CPP)
-	rm -f $(HDIR)/RequestQueue.h RequestQueue.cpp
-	$(SLICECMD) $(SDIR)/RequestQueue.ice
-	mv RequestQueue.h $(HDIR)
-
-clean::
-	rm -f $(HDIR)/RequestQueue.h RequestQueue.cpp
-
-$(HDIR)/RequestQueueF.h: $(SDIR)/RequestQueueF.ice $(SLICE2CPP)
-	rm -f $(HDIR)/RequestQueueF.h RequestQueueF.cpp
-	$(SLICECMD) $(SDIR)/RequestQueueF.ice
-	mv RequestQueueF.h $(HDIR)
-	rm -f RequestQueueF.cpp
-
-clean::
-	rm -f $(HDIR)/RequestQueueF.h
-
 $(HDIR)/Properties.h Properties.cpp: $(SDIR)/Properties.ice $(SLICE2CPP)
 	rm -f $(HDIR)/Properties.h Properties.cpp
 	$(SLICECMD) $(SDIR)/Properties.ice
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 5b55c53d70d..841a8a9f8cf 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -240,18 +240,6 @@ Ice::ObjectAdapterI::findServantLocator(const string& prefix)
     }
 }
 
-RequestQueuePtr
-Ice::ObjectAdapterI::createRequestQueue(const std::string&)
-{
-    return 0; // Not implemented yet.
-}
-
-RequestQueuePtr
-Ice::ObjectAdapterI::findRequestQueue(const std::string&)
-{
-    return 0; // Not implemented yet.
-}
-
 ObjectPtr
 Ice::ObjectAdapterI::identityToServant(const Identity& ident)
 {
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 4a7f7a7e982..f8f1b108d98 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -49,9 +49,6 @@ public:
     virtual void removeServantLocator(const std::string&);
     virtual ServantLocatorPtr findServantLocator(const std::string&);
 
-    virtual RequestQueuePtr createRequestQueue(const std::string&);
-    virtual RequestQueuePtr findRequestQueue(const std::string&);
-
     virtual ObjectPtr identityToServant(const Identity&);
     virtual ObjectPtr proxyToServant(const ObjectPrx&);
 
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index 47d9c62bc0e..5f94a34649a 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -308,10 +308,6 @@ SOURCE=.\ReferenceFactory.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RequestQueue.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Router.cpp

 # End Source File

 # Begin Source File

@@ -796,14 +792,6 @@ SOURCE=.\ReferenceFactoryF.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\Ice\RequestQueue.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\Ice\RequestQueueF.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\Ice\Router.h

 # End Source File

 # Begin Source File

@@ -1698,86 +1686,6 @@ InputPath=..\..\slice\Ice\PropertiesF.ice
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\slice\Ice\RequestQueue.ice

-

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

-

-USERDEP__REQUE="../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\RequestQueue.ice

-

-BuildCmds= \

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

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RequestQueue.ice \

-	move RequestQueue.h ..\..\include\Ice \

-	

-

-"..\..\include\Ice\RequestQueue.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

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

-

-USERDEP__REQUE="../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\RequestQueue.ice

-

-BuildCmds= \

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

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RequestQueue.ice \

-	move RequestQueue.h ..\..\include\Ice \

-	

-

-"..\..\include\Ice\RequestQueue.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\slice\Ice\RequestQueueF.ice

-

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

-

-USERDEP__REQUES="../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\RequestQueueF.ice

-

-"..\..\include\Ice\RequestQueueF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RequestQueueF.ice 

-	move RequestQueueF.h ..\..\include\Ice 

-	del RequestQueueF.cpp 

-	

-# End Custom Build

-

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

-

-USERDEP__REQUES="../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=..\..\slice\Ice\RequestQueueF.ice

-

-"..\..\include\Ice\RequestQueueF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

-	..\..\bin\slice2cpp.exe --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/RequestQueueF.ice 

-	move RequestQueueF.h ..\..\include\Ice 

-	del RequestQueueF.cpp 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\slice\Ice\Router.ice

 

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

diff --git a/cpp/src/IcePack/Parser.h b/cpp/src/IcePack/Parser.h
index 060b272f218..2d891c2086c 100644
--- a/cpp/src/IcePack/Parser.h
+++ b/cpp/src/IcePack/Parser.h
@@ -46,7 +46,7 @@ int yyparse();
 // Newer bison versions allow to disable stack resizing by defining
 // yyoverflow.
 //
-#define yyoverflow
+#define yyoverflow(a, b, c, d, e, f) yyerror(a)
 
 namespace IcePack
 {
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index a06cc65eb54..3b8a4936fe7 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -46,7 +46,7 @@ int yyparse();
 // Newer bison versions allow to disable stack resizing by defining
 // yyoverflow.
 //
-#define yyoverflow
+#define yyoverflow(a, b, c, d, e, f) yyerror(a)
 
 namespace IceStorm
 {
diff --git a/cpp/src/Slice/.depend b/cpp/src/Slice/.depend
index 54fc035d039..c3d29487ae6 100644
--- a/cpp/src/Slice/.depend
+++ b/cpp/src/Slice/.depend
@@ -1,5 +1,3 @@
 Scanner.o: Scanner.cpp ../Slice/GrammarUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../Slice/Grammar.h
 Grammar.o: Grammar.cpp ../Slice/GrammarUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h
 Parser.o: Parser.cpp ../../include/IceUtil/Functional.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h
-CPlusPlusUtil.o: CPlusPlusUtil.cpp ../../include/Slice/CPlusPlusUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/OutputUtil.h
-JavaUtil.o: JavaUtil.cpp ../../include/Slice/JavaUtil.h ../../include/Slice/Parser.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/OutputUtil.h ../../include/IceUtil/Functional.h