You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/09/03 23:26:43 UTC
[2/2] qpid-proton git commit: PROTON-865: Building on windows,
problems running the example tests.
PROTON-865: Building on windows, problems running the example tests.
- disabled c++11 on windows, we should re-enable when we figure out what VC version does actually support enough of c++11 to build the binding in that mode.
- Added missing PN_CPP_EXTERN
- Added missing header files.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/76fac4bd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/76fac4bd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/76fac4bd
Branch: refs/heads/cjansen-cpp-client
Commit: 76fac4bd4fffddaf082d37afe3747ff3e7493a2a
Parents: 2fcbc25
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Sep 3 16:34:07 2015 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Sep 3 17:23:04 2015 -0400
----------------------------------------------------------------------
examples/cpp/broker.cpp | 1 +
examples/cpp/server.cpp | 1 +
examples/cpp/server_direct.cpp | 2 ++
proton-c/bindings/cpp/include/proton/config.hpp | 2 +-
.../bindings/cpp/include/proton/counted_ptr.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/data.hpp | 6 +++---
proton-c/bindings/cpp/include/proton/endpoint.hpp | 16 ++++++++--------
proton-c/bindings/cpp/include/proton/message.hpp | 4 ++--
proton-c/bindings/cpp/include/proton/url.hpp | 8 +++++---
9 files changed, 25 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/examples/cpp/broker.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/broker.cpp b/examples/cpp/broker.cpp
index 7752645..b227530 100644
--- a/examples/cpp/broker.cpp
+++ b/examples/cpp/broker.cpp
@@ -21,6 +21,7 @@
#include "options.hpp"
+#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/messaging_handler.hpp"
#include "proton/url.hpp"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/examples/cpp/server.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server.cpp b/examples/cpp/server.cpp
index 2aa097c..bed9ee0 100644
--- a/examples/cpp/server.cpp
+++ b/examples/cpp/server.cpp
@@ -28,6 +28,7 @@
#include <iostream>
#include <map>
#include <string>
+#include <cctype>
class server : public proton::messaging_handler {
private:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/examples/cpp/server_direct.cpp
----------------------------------------------------------------------
diff --git a/examples/cpp/server_direct.cpp b/examples/cpp/server_direct.cpp
index c89edca..045b505 100644
--- a/examples/cpp/server_direct.cpp
+++ b/examples/cpp/server_direct.cpp
@@ -21,6 +21,7 @@
#include "options.hpp"
+#include "proton/acceptor.hpp"
#include "proton/container.hpp"
#include "proton/messaging_handler.hpp"
#include "proton/url.hpp"
@@ -29,6 +30,7 @@
#include <map>
#include <string>
#include <sstream>
+#include <cctype>
class server : public proton::messaging_handler {
private:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/config.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/config.hpp b/proton-c/bindings/cpp/include/proton/config.hpp
index 7f0a8f4..3ae2d73 100644
--- a/proton-c/bindings/cpp/include/proton/config.hpp
+++ b/proton-c/bindings/cpp/include/proton/config.hpp
@@ -32,7 +32,7 @@
#ifndef PN_USE_CPP11
-#if ((defined(__cplusplus) && __cplusplus >= 201100) || (defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 150030729))
+#if ((defined(__cplusplus) && __cplusplus >= 201100))
#define PN_USE_CPP11 1
#else
#define PN_USE_CPP11 0
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/counted_ptr.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/counted_ptr.hpp b/proton-c/bindings/cpp/include/proton/counted_ptr.hpp
index becb0b7..b9bdca9 100644
--- a/proton-c/bindings/cpp/include/proton/counted_ptr.hpp
+++ b/proton-c/bindings/cpp/include/proton/counted_ptr.hpp
@@ -35,8 +35,8 @@ namespace proton {
// Default refcounting uses pn_incref, pn_decref. Other types must define
// their own incref/decref overloads.
-void incref(const void*);
-void decref(const void*);
+PN_CPP_EXTERN void incref(const void*);
+PN_CPP_EXTERN void decref(const void*);
///@endcond
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/data.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/data.hpp b/proton-c/bindings/cpp/include/proton/data.hpp
index 019d3bb..98d3973 100644
--- a/proton-c/bindings/cpp/include/proton/data.hpp
+++ b/proton-c/bindings/cpp/include/proton/data.hpp
@@ -66,10 +66,10 @@ class data : public facade<pn_data_t, data, comparable<data> > {
/** Get the current value */
template<class T> T get() { T t; get(t); return t; }
- bool operator==(const data& x) const;
- bool operator<(const data& x) const;
+ PN_CPP_EXTERN bool operator==(const data& x) const;
+ PN_CPP_EXTERN bool operator<(const data& x) const;
- void operator delete(void *);
+ PN_CPP_EXTERN void operator delete(void *);
/** Human readable representation of data. */
friend PN_CPP_EXTERN std::ostream& operator<<(std::ostream&, const data&);
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/endpoint.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/endpoint.hpp b/proton-c/bindings/cpp/include/proton/endpoint.hpp
index 665ab0c..51560e0 100644
--- a/proton-c/bindings/cpp/include/proton/endpoint.hpp
+++ b/proton-c/bindings/cpp/include/proton/endpoint.hpp
@@ -47,14 +47,14 @@ class endpoint
typedef int state;
/// endpoint state bit values @{
- static const int LOCAL_UNINIT; ///< Local endpoint is un-initialized
- static const int REMOTE_UNINIT; ///< Remote endpoint is un-initialized
- static const int LOCAL_ACTIVE; ///< Local endpoint is active
- static const int REMOTE_ACTIVE; ///< Remote endpoint is active
- static const int LOCAL_CLOSED; ///< Local endpoint has been closed
- static const int REMOTE_CLOSED; ///< Remote endpoint has been closed
- static const int LOCAL_MASK; ///< Mask including all LOCAL_ bits (UNINIT, ACTIVE, CLOSED)
- static const int REMOTE_MASK; ///< Mask including all REMOTE_ bits (UNINIT, ACTIVE, CLOSED)
+ PN_CPP_EXTERN static const int LOCAL_UNINIT; ///< Local endpoint is un-initialized
+ PN_CPP_EXTERN static const int REMOTE_UNINIT; ///< Remote endpoint is un-initialized
+ PN_CPP_EXTERN static const int LOCAL_ACTIVE; ///< Local endpoint is active
+ PN_CPP_EXTERN static const int REMOTE_ACTIVE; ///< Remote endpoint is active
+ PN_CPP_EXTERN static const int LOCAL_CLOSED; ///< Local endpoint has been closed
+ PN_CPP_EXTERN static const int REMOTE_CLOSED; ///< Remote endpoint has been closed
+ PN_CPP_EXTERN static const int LOCAL_MASK; ///< Mask including all LOCAL_ bits (UNINIT, ACTIVE, CLOSED)
+ PN_CPP_EXTERN static const int REMOTE_MASK; ///< Mask including all REMOTE_ bits (UNINIT, ACTIVE, CLOSED)
///@}
// TODO: condition, remote_condition, update_condition, get/handler
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/message.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/message.hpp b/proton-c/bindings/cpp/include/proton/message.hpp
index f94f9da..d04ee1a 100644
--- a/proton-c/bindings/cpp/include/proton/message.hpp
+++ b/proton-c/bindings/cpp/include/proton/message.hpp
@@ -42,7 +42,7 @@ class message : public facade<pn_message_t, message>
PN_CPP_EXTERN static PN_UNIQUE_PTR<message> create();
/// Copy data from m to this.
- message& operator=(const message& m);
+ PN_CPP_EXTERN message& operator=(const message& m);
/** Clear the message content and properties. */
PN_CPP_EXTERN void clear();
@@ -120,7 +120,7 @@ class message : public facade<pn_message_t, message>
/// Decode the message from link corresponding to delivery.
PN_CPP_EXTERN void decode(proton::link&, proton::delivery&);
- void operator delete(void*);
+ PN_CPP_EXTERN void operator delete(void*);
};
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/76fac4bd/proton-c/bindings/cpp/include/proton/url.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/include/proton/url.hpp b/proton-c/bindings/cpp/include/proton/url.hpp
index cffc0a4..235ece8 100644
--- a/proton-c/bindings/cpp/include/proton/url.hpp
+++ b/proton-c/bindings/cpp/include/proton/url.hpp
@@ -28,7 +28,9 @@ struct pn_url_t;
namespace proton {
/// Thrown if URL parsing fails.
-struct bad_url : public error { PN_CPP_EXTERN explicit bad_url(const std::string&) throw(); };
+struct bad_url : public error {
+ PN_CPP_EXTERN explicit bad_url(const std::string&) throw();
+};
/**
@@ -108,13 +110,13 @@ class url {
/** defaults fills in default values for missing parts of the URL */
PN_CPP_EXTERN void defaults();
- friend std::ostream& operator<<(std::ostream&, const url&);
+ friend PN_CPP_EXTERN std::ostream& operator<<(std::ostream&, const url&);
/** parse url from istream, automatically fills in defaults for missing values.
*
* Note: an invalid url is indicated by setting std::stream::fail() NOT by throwing bad_url.
*/
- friend std::istream& operator>>(std::istream&, url&);
+ friend PN_CPP_EXTERN std::istream& operator>>(std::istream&, url&);
private:
pn_url_t* url_;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org