qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kgiu...@apache.org
Subject svn commit: r1545842 - in /qpid/branches/0.26/qpid/cpp: bindings/qmf2/examples/cpp/ include/qmf/ include/qmf/posix/
Date Tue, 26 Nov 2013 21:10:01 GMT
Author: kgiusti
Date: Tue Nov 26 21:10:01 2013
New Revision: 1545842

URL: http://svn.apache.org/r1545842
Log:
QPID-5369: Issue compile-time error if deprecated QMF Agent or Console API used by applications
- merge fix to 0.26 branch

(cherry picked from commit 21dc9ccb0de8520259aaf8c9dbd1206fd8a03bd2)

Modified:
    qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
    qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
    qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
    qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
    qpid/branches/0.26/qpid/cpp/include/qmf/Agent.h
    qpid/branches/0.26/qpid/cpp/include/qmf/AgentEvent.h
    qpid/branches/0.26/qpid/cpp/include/qmf/AgentSession.h
    qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleEvent.h
    qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleSession.h
    qpid/branches/0.26/qpid/cpp/include/qmf/Data.h
    qpid/branches/0.26/qpid/cpp/include/qmf/DataAddr.h
    qpid/branches/0.26/qpid/cpp/include/qmf/Handle.h
    qpid/branches/0.26/qpid/cpp/include/qmf/Query.h
    qpid/branches/0.26/qpid/cpp/include/qmf/Schema.h
    qpid/branches/0.26/qpid/cpp/include/qmf/SchemaId.h
    qpid/branches/0.26/qpid/cpp/include/qmf/SchemaMethod.h
    qpid/branches/0.26/qpid/cpp/include/qmf/SchemaProperty.h
    qpid/branches/0.26/qpid/cpp/include/qmf/SchemaTypes.h
    qpid/branches/0.26/qpid/cpp/include/qmf/Subscription.h
    qpid/branches/0.26/qpid/cpp/include/qmf/exceptions.h
    qpid/branches/0.26/qpid/cpp/include/qmf/posix/EventNotifier.h
    qpid/branches/0.26/qpid/cpp/include/qmf/qmf2.i

Modified: qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp Tue
Nov 26 21:10:01 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/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp Tue Nov 26 21:10:01
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/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp (original)
+++ qpid/branches/0.26/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp Tue Nov 26 21:10:01
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/branches/0.26/qpid/cpp/include/qmf/Agent.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Agent.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Agent.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Agent.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/AgentEvent.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/AgentEvent.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/AgentEvent.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/AgentEvent.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/AgentSession.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/AgentSession.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/AgentSession.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/AgentSession.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/ConsoleEvent.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleEvent.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleEvent.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleEvent.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/ConsoleSession.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleSession.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleSession.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/ConsoleSession.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/Data.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Data.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Data.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Data.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/DataAddr.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/DataAddr.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/DataAddr.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/DataAddr.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/Handle.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Handle.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Handle.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Handle.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/Query.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Query.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Query.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Query.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/Schema.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Schema.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Schema.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Schema.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/SchemaId.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/SchemaId.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/SchemaId.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/SchemaId.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/SchemaMethod.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/SchemaMethod.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/SchemaMethod.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/SchemaMethod.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/SchemaProperty.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/SchemaProperty.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/SchemaProperty.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/SchemaProperty.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/SchemaTypes.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/SchemaTypes.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/SchemaTypes.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/SchemaTypes.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/Subscription.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/Subscription.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/Subscription.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/Subscription.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/exceptions.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/exceptions.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/exceptions.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/exceptions.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/posix/EventNotifier.h
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/posix/EventNotifier.h?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/posix/EventNotifier.h (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/posix/EventNotifier.h Tue Nov 26 21:10:01 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/branches/0.26/qpid/cpp/include/qmf/qmf2.i
URL: http://svn.apache.org/viewvc/qpid/branches/0.26/qpid/cpp/include/qmf/qmf2.i?rev=1545842&r1=1545841&r2=1545842&view=diff
==============================================================================
--- qpid/branches/0.26/qpid/cpp/include/qmf/qmf2.i (original)
+++ qpid/branches/0.26/qpid/cpp/include/qmf/qmf2.i Tue Nov 26 21:10:01 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


Mime
View raw message