You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2013/11/25 19:47:17 UTC
svn commit: r1545368 - in /qpid/trunk/qpid/cpp: bindings/qmf2/examples/cpp/
include/qmf/ include/qmf/posix/
Author: kgiusti
Date: Mon Nov 25 18:47:16 2013
New Revision: 1545368
URL: http://svn.apache.org/r1545368
Log:
QPID-5369: Issue compile-time error if deprecated QMF Agent or Console API used by applications
Modified:
qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
qpid/trunk/qpid/cpp/include/qmf/Agent.h
qpid/trunk/qpid/cpp/include/qmf/AgentEvent.h
qpid/trunk/qpid/cpp/include/qmf/AgentSession.h
qpid/trunk/qpid/cpp/include/qmf/ConsoleEvent.h
qpid/trunk/qpid/cpp/include/qmf/ConsoleSession.h
qpid/trunk/qpid/cpp/include/qmf/Data.h
qpid/trunk/qpid/cpp/include/qmf/DataAddr.h
qpid/trunk/qpid/cpp/include/qmf/Handle.h
qpid/trunk/qpid/cpp/include/qmf/Query.h
qpid/trunk/qpid/cpp/include/qmf/Schema.h
qpid/trunk/qpid/cpp/include/qmf/SchemaId.h
qpid/trunk/qpid/cpp/include/qmf/SchemaMethod.h
qpid/trunk/qpid/cpp/include/qmf/SchemaProperty.h
qpid/trunk/qpid/cpp/include/qmf/SchemaTypes.h
qpid/trunk/qpid/cpp/include/qmf/Subscription.h
qpid/trunk/qpid/cpp/include/qmf/exceptions.h
qpid/trunk/qpid/cpp/include/qmf/posix/EventNotifier.h
qpid/trunk/qpid/cpp/include/qmf/qmf2.i
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp Mon Nov 25 18:47:16 2013
@@ -19,6 +19,8 @@
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
#include <qmf/AgentSession.h>
#include <qmf/AgentEvent.h>
#include <qmf/Schema.h>
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp Mon Nov 25 18:47:16 2013
@@ -22,6 +22,8 @@
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
#include <qmf/Agent.h>
#include <qmf/ConsoleEvent.h>
#include <qmf/ConsoleSession.h>
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp Mon Nov 25 18:47:16 2013
@@ -19,6 +19,8 @@
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
#include <qmf/ConsoleSession.h>
#include <qmf/ConsoleEvent.h>
#include <qmf/Agent.h>
Modified: qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp Mon Nov 25 18:47:16 2013
@@ -19,6 +19,8 @@
#include <qpid/messaging/Connection.h>
#include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
#include <qmf/ConsoleSession.h>
#include <qmf/ConsoleEvent.h>
#include <qmf/Data.h>
Modified: qpid/trunk/qpid/cpp/include/qmf/Agent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Agent.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Agent.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Agent.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
//#include "qmf/Subscription.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/AgentEvent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/AgentEvent.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/AgentEvent.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/AgentEvent.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Variant.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/AgentSession.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/AgentSession.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/AgentSession.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/AgentSession.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/messaging/Duration.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/ConsoleEvent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/ConsoleEvent.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/ConsoleEvent.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/ConsoleEvent.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qmf/Agent.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/ConsoleSession.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/ConsoleSession.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/ConsoleSession.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/ConsoleSession.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qmf/Agent.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/Data.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Data.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Data.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Data.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qmf/exceptions.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/DataAddr.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/DataAddr.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/DataAddr.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/DataAddr.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Variant.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/Handle.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Handle.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Handle.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Handle.h Mon Nov 25 18:47:16 2013
@@ -22,6 +22,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include "qmf/ImportExport.h"
namespace qmf {
Modified: qpid/trunk/qpid/cpp/include/qmf/Query.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Query.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Query.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Query.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Variant.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/Schema.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Schema.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Schema.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Schema.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qpid/sys/IntegerTypes.h"
#include "qmf/Handle.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/SchemaId.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/SchemaId.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/SchemaId.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/SchemaId.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Uuid.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/SchemaMethod.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/SchemaMethod.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/SchemaMethod.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/SchemaMethod.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include "qmf/ImportExport.h"
#include "qpid/sys/IntegerTypes.h"
#include "qmf/Handle.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/SchemaProperty.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/SchemaProperty.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/SchemaProperty.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/SchemaProperty.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Uuid.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/SchemaTypes.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/SchemaTypes.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/SchemaTypes.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/SchemaTypes.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
namespace qmf {
const int SCHEMA_TYPE_DATA = 1;
Modified: qpid/trunk/qpid/cpp/include/qmf/Subscription.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/Subscription.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/Subscription.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/Subscription.h Mon Nov 25 18:47:16 2013
@@ -21,6 +21,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qpid/types/Variant.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/exceptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/exceptions.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/exceptions.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/exceptions.h Mon Nov 25 18:47:16 2013
@@ -22,6 +22,11 @@
*
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include "qmf/ImportExport.h"
#include "qpid/types/Exception.h"
#include "qpid/types/Variant.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/posix/EventNotifier.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/posix/EventNotifier.h?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/posix/EventNotifier.h (original)
+++ qpid/trunk/qpid/cpp/include/qmf/posix/EventNotifier.h Mon Nov 25 18:47:16 2013
@@ -20,6 +20,11 @@
* under the License.
*/
+#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
+# error "The API defined in this file has been DEPRECATED and will be removed in the future."
+# error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
+#endif
+
#include <qmf/ImportExport.h>
#include "qmf/Handle.h"
#include "qmf/AgentSession.h"
Modified: qpid/trunk/qpid/cpp/include/qmf/qmf2.i
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qmf/qmf2.i?rev=1545368&r1=1545367&r2=1545368&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qmf/qmf2.i (original)
+++ qpid/trunk/qpid/cpp/include/qmf/qmf2.i Mon Nov 25 18:47:16 2013
@@ -19,6 +19,7 @@
%{
+#define QMF_USE_DEPRECATED_API
#include <qmf/exceptions.h>
#include <qmf/AgentEvent.h>
#include <qmf/Agent.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org