summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Freeze/library/Parser.h2
-rw-r--r--cpp/demo/Freeze/phonebook/Parser.h2
-rw-r--r--cpp/include/Slice/Parser.h2
-rw-r--r--cpp/slice/Ice/ObjectAdapter.ice43
-rw-r--r--cpp/slice/Ice/RequestQueue.ice60
-rw-r--r--cpp/slice/Ice/RequestQueueF.ice21
-rw-r--r--cpp/src/Ice/Makefile18
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp12
-rw-r--r--cpp/src/Ice/ObjectAdapterI.h3
-rw-r--r--cpp/src/Ice/ice.dsp92
-rw-r--r--cpp/src/IcePack/Parser.h2
-rw-r--r--cpp/src/IceStorm/Parser.h2
-rw-r--r--cpp/src/Slice/.depend2
-rw-r--r--cpp/test/Freeze/complex/Parser.h2
14 files changed, 6 insertions, 257 deletions
diff --git a/cpp/demo/Freeze/library/Parser.h b/cpp/demo/Freeze/library/Parser.h
index 33b2f535675..01757b87a04 100644
--- a/cpp/demo/Freeze/library/Parser.h
+++ b/cpp/demo/Freeze/library/Parser.h
@@ -47,7 +47,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)
class Parser;
typedef ::IceUtil::Handle<Parser> ParserPtr;
diff --git a/cpp/demo/Freeze/phonebook/Parser.h b/cpp/demo/Freeze/phonebook/Parser.h
index ef13a73cabd..f7ecbb92e4a 100644
--- a/cpp/demo/Freeze/phonebook/Parser.h
+++ b/cpp/demo/Freeze/phonebook/Parser.h
@@ -47,7 +47,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)
class Parser;
typedef ::IceUtil::Handle<Parser> ParserPtr;
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index 6bfd1207c48..35b5c9468c5 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -100,7 +100,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 Slice
{
diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice
index fdd7910f8ca..01c056bd4d4 100644
--- a/cpp/slice/Ice/ObjectAdapter.ice
+++ b/cpp/slice/Ice/ObjectAdapter.ice
@@ -13,7 +13,6 @@
#include <Ice/CommunicatorF.ice>
#include <Ice/ServantLocatorF.ice>
-#include <Ice/RequestQueueF.ice>
#include <Ice/RouterF.ice>
#include <Ice/Identity.ice>
@@ -28,7 +27,6 @@ module Ice
*
* @see Communicator
* @see ServantLocator
- * @see RequestQueue
*
**/
local interface ObjectAdapter
@@ -241,47 +239,6 @@ local interface ObjectAdapter
/**
*
- * Create a Request Queue for this Object Adapter. If a queue has
- * already been created for the given category, the formerly
- * created queue is returned.
- *
- * <note><para>Only one queue for an empty category can be
- * installed.</para></note>
- *
- * @param category The category for which a Request Queue is
- * created, or an empty string if the Request Queue is does not
- * belong to any specific category.
- *
- * @return The new Request Queue for the category, or, if a
- * Request Queue for the given category has already been created
- * before, such formerly created Request Queue.
- *
- * @see Identity
- * @see findRequestQueue
- * @see RequestQueue
- *
- **/
- RequestQueue createRequestQueue(string category);
-
- /**
- *
- * Find a Request Queue created with this Object Adapter.
- *
- * @param category The category for which to look up a Request
- * Queue.
- *
- * @return The Request Queue, or null if no Request Queue exists
- * for the given category.
- *
- * @see Identity
- * @see createRequestQueue
- * @see RequestQueue
- *
- **/
- RequestQueue findRequestQueue(string category);
-
- /**
- *
* Look up a Servant in this Object Adapter's Active Servant Map
* by the identity of the Ice Object it implements.
*
diff --git a/cpp/slice/Ice/RequestQueue.ice b/cpp/slice/Ice/RequestQueue.ice
deleted file mode 100644
index d4eb7899a07..00000000000
--- a/cpp/slice/Ice/RequestQueue.ice
+++ /dev/null
@@ -1,60 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef ICE_REQUEST_QUEUE_ICE
-#define ICE_REQUEST_QUEUE_ICE
-
-#include <Ice/ObjectAdapterF.ice>
-#include <Ice/Current.ice>
-
-module Ice
-{
-
-/**
- *
- * The Request Queue, created and managed by Object Adapters. Request
- * Queues buffer requests, and allow to dispatch all such buffered
- * requests manually in an application-supplied thread.
- *
- * @see ObjectAdapter
- * @see ObjectAdapter::createRequestQueue
- * @see ObjectAdapter::findRequestQueue
- *
- **/
-local interface RequestQueue
-{
- /**
- *
- * Dispatch all buffered requests. The dispatch thread is the
- * thread that calls this operation. Potential exceptions are not
- * returned to the caller, but handled just in the same manner as
- * if the Ice core would have dispatched the requests.
- *
- **/
- void dispatch();
-
- /**
- *
- * Destroy this request queue, and remove it from its Object
- * Adapter.
- *
- * @param dispatch If set to true, all requests still buffered in
- * the queue will be dispatched before destruction, so that no
- * requests can get lost. The behavior is the same as if
- * <literal>dispatch()</literal> and
- * <literal>destroy(false)</literal> would be called atomically.
- *
- **/
- void destroy(bool dispatch);
-};
-
-};
-
-#endif
diff --git a/cpp/slice/Ice/RequestQueueF.ice b/cpp/slice/Ice/RequestQueueF.ice
deleted file mode 100644
index e5100afeb1a..00000000000
--- a/cpp/slice/Ice/RequestQueueF.ice
+++ /dev/null
@@ -1,21 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// MutableRealms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef ICE_REQUEST_QUEUE_F_ICE
-#define ICE_REQUEST_QUEUE_F_ICE
-
-module Ice
-{
-
-local interface RequestQueue;
-
-};
-
-#endif
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
diff --git a/cpp/test/Freeze/complex/Parser.h b/cpp/test/Freeze/complex/Parser.h
index a5b22d667ab..a763938a0e9 100644
--- a/cpp/test/Freeze/complex/Parser.h
+++ b/cpp/test/Freeze/complex/Parser.h
@@ -44,7 +44,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)
//
// unput() isn't needed. This prevents the function being defined, and
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 08:49:17 +0000