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/06/18 23:58:09 UTC
[31/50] [abbrv] qpid-proton git commit: PROTON-865: Use .hpp
extension for C++ headers.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Msg.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Msg.h b/proton-c/bindings/cpp/src/Msg.h
deleted file mode 100644
index 2b4c6da..0000000
--- a/proton-c/bindings/cpp/src/Msg.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef PROTON_MSG_H
-#define PROTON_MSG_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <sstream>
-#include <iostream>
-
-namespace proton {
-namespace reactor {
-
-/** A simple wrapper for std::ostringstream that allows
- * in place construction of a message and automatic conversion
- * to string.
- * E.g.
- *@code
- * void foo(const std::string&);
- * foo(Msg() << "hello " << 32);
- *@endcode
- * Will construct the string "hello 32" and pass it to foo()
- */
-struct Msg {
- std::ostringstream os;
- Msg() {}
- Msg(const Msg& m) : os(m.str()) {}
- std::string str() const { return os.str(); }
- operator std::string() const { return str(); }
- template <class T> Msg& operator<<(const T& t) { os <<t; return *this; }
-};
-
-inline std::ostream& operator<<(std::ostream& o, const Msg& m) { return o << m.str(); }
-
-/** Construct a message using operator << and append (file:line) */
-#define QUOTE_(x) #x
-#define QUOTE(x) QUOTE_(x)
-#define MSG(message) (::proton::reactor::Msg() << message)
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_MSG_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Msg.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Msg.hpp b/proton-c/bindings/cpp/src/Msg.hpp
new file mode 100644
index 0000000..2b4c6da
--- /dev/null
+++ b/proton-c/bindings/cpp/src/Msg.hpp
@@ -0,0 +1,59 @@
+#ifndef PROTON_MSG_H
+#define PROTON_MSG_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <sstream>
+#include <iostream>
+
+namespace proton {
+namespace reactor {
+
+/** A simple wrapper for std::ostringstream that allows
+ * in place construction of a message and automatic conversion
+ * to string.
+ * E.g.
+ *@code
+ * void foo(const std::string&);
+ * foo(Msg() << "hello " << 32);
+ *@endcode
+ * Will construct the string "hello 32" and pass it to foo()
+ */
+struct Msg {
+ std::ostringstream os;
+ Msg() {}
+ Msg(const Msg& m) : os(m.str()) {}
+ std::string str() const { return os.str(); }
+ operator std::string() const { return str(); }
+ template <class T> Msg& operator<<(const T& t) { os <<t; return *this; }
+};
+
+inline std::ostream& operator<<(std::ostream& o, const Msg& m) { return o << m.str(); }
+
+/** Construct a message using operator << and append (file:line) */
+#define QUOTE_(x) #x
+#define QUOTE(x) QUOTE_(x)
+#define MSG(message) (::proton::reactor::Msg() << message)
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_MSG_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/PrivateImplRef.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/PrivateImplRef.h b/proton-c/bindings/cpp/src/PrivateImplRef.h
deleted file mode 100644
index a2dccc2..0000000
--- a/proton-c/bindings/cpp/src/PrivateImplRef.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef PROTON_CPP_PRIVATEIMPL_H
-#define PROTON_CPP_PRIVATEIMPL_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include "proton/cpp/ImportExport.h"
-
-namespace proton {
-namespace reactor {
-
-// Modified from qpid::messaging version to work without
-// boost::intrusive_ptr but integrate with Proton's pn_class_t
-// reference counting. Thread safety currently absent but fluid in
-// intention...
-
-
-/**
- * Helper class to implement a class with a private, reference counted
- * implementation and reference semantics.
- *
- * Such classes are used in the public API to hide implementation, they
- * should. Example of use:
- *
- * === Foo.h
- *
- * template <class T> PrivateImplRef;
- * class FooImpl;
- *
- * Foo : public Handle<FooImpl> {
- * public:
- * Foo(FooImpl* = 0);
- * Foo(const Foo&);
- * ~Foo();
- * Foo& operator=(const Foo&);
- *
- * int fooDo(); // and other Foo functions...
- *
- * private:
- * typedef FooImpl Impl;
- * Impl* impl;
- * friend class PrivateImplRef<Foo>;
- *
- * === Foo.cpp
- *
- * typedef PrivateImplRef<Foo> PI;
- * Foo::Foo(FooImpl* p) { PI::ctor(*this, p); }
- * Foo::Foo(const Foo& c) : Handle<FooImpl>() { PI::copy(*this, c); }
- * Foo::~Foo() { PI::dtor(*this); }
- * Foo& Foo::operator=(const Foo& c) { return PI::assign(*this, c); }
- *
- * int foo::fooDo() { return impl->fooDo(); }
- *
- */
-template <class T> class PrivateImplRef {
- public:
- typedef typename T::Impl Impl;
-
- /** Get the implementation pointer from a handle */
- static Impl* get(const T& t) { return t.impl; }
-
- /** Set the implementation pointer in a handle */
- static void set(T& t, const Impl* p) {
- if (t.impl == p) return;
- if (t.impl) Impl::decref(t.impl);
- t.impl = const_cast<Impl *>(p);
- if (t.impl) Impl::incref(t.impl);
- }
-
- // Helper functions to implement the ctor, dtor, copy, assign
- static void ctor(T& t, Impl* p) { t.impl = p; if (p) Impl::incref(p); }
- static void copy(T& t, const T& x) { if (&t == &x) return; t.impl = 0; assign(t, x); }
- static void dtor(T& t) { if(t.impl) Impl::decref(t.impl); }
- static T& assign(T& t, const T& x) { set(t, get(x)); return t;}
-};
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_CPP_PRIVATEIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/PrivateImplRef.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/PrivateImplRef.hpp b/proton-c/bindings/cpp/src/PrivateImplRef.hpp
new file mode 100644
index 0000000..494fef0
--- /dev/null
+++ b/proton-c/bindings/cpp/src/PrivateImplRef.hpp
@@ -0,0 +1,97 @@
+#ifndef PROTON_CPP_PRIVATEIMPL_H
+#define PROTON_CPP_PRIVATEIMPL_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "proton/ImportExport.hpp"
+
+namespace proton {
+namespace reactor {
+
+// Modified from qpid::messaging version to work without
+// boost::intrusive_ptr but integrate with Proton's pn_class_t
+// reference counting. Thread safety currently absent but fluid in
+// intention...
+
+
+/**
+ * Helper class to implement a class with a private, reference counted
+ * implementation and reference semantics.
+ *
+ * Such classes are used in the public API to hide implementation, they
+ * should. Example of use:
+ *
+ * === Foo.h
+ *
+ * template <class T> PrivateImplRef;
+ * class FooImpl;
+ *
+ * Foo : public Handle<FooImpl> {
+ * public:
+ * Foo(FooImpl* = 0);
+ * Foo(const Foo&);
+ * ~Foo();
+ * Foo& operator=(const Foo&);
+ *
+ * int fooDo(); // and other Foo functions...
+ *
+ * private:
+ * typedef FooImpl Impl;
+ * Impl* impl;
+ * friend class PrivateImplRef<Foo>;
+ *
+ * === Foo.cpp
+ *
+ * typedef PrivateImplRef<Foo> PI;
+ * Foo::Foo(FooImpl* p) { PI::ctor(*this, p); }
+ * Foo::Foo(const Foo& c) : Handle<FooImpl>() { PI::copy(*this, c); }
+ * Foo::~Foo() { PI::dtor(*this); }
+ * Foo& Foo::operator=(const Foo& c) { return PI::assign(*this, c); }
+ *
+ * int foo::fooDo() { return impl->fooDo(); }
+ *
+ */
+template <class T> class PrivateImplRef {
+ public:
+ typedef typename T::Impl Impl;
+
+ /** Get the implementation pointer from a handle */
+ static Impl* get(const T& t) { return t.impl; }
+
+ /** Set the implementation pointer in a handle */
+ static void set(T& t, const Impl* p) {
+ if (t.impl == p) return;
+ if (t.impl) Impl::decref(t.impl);
+ t.impl = const_cast<Impl *>(p);
+ if (t.impl) Impl::incref(t.impl);
+ }
+
+ // Helper functions to implement the ctor, dtor, copy, assign
+ static void ctor(T& t, Impl* p) { t.impl = p; if (p) Impl::incref(p); }
+ static void copy(T& t, const T& x) { if (&t == &x) return; t.impl = 0; assign(t, x); }
+ static void dtor(T& t) { if(t.impl) Impl::decref(t.impl); }
+ static T& assign(T& t, const T& x) { set(t, get(x)); return t;}
+};
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_CPP_PRIVATEIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/ProtonEvent.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/ProtonEvent.cpp b/proton-c/bindings/cpp/src/ProtonEvent.cpp
index 0b0f1d0..4567ea7 100644
--- a/proton-c/bindings/cpp/src/ProtonEvent.cpp
+++ b/proton-c/bindings/cpp/src/ProtonEvent.cpp
@@ -23,14 +23,14 @@
#include "proton/event.h"
#include "proton/link.h"
-#include "proton/cpp/ProtonEvent.h"
-#include "proton/cpp/ProtonHandler.h"
-#include "proton/cpp/exceptions.h"
-#include "proton/cpp/Container.h"
-
-#include "ConnectionImpl.h"
-#include "Msg.h"
-#include "contexts.h"
+#include "proton/ProtonEvent.hpp"
+#include "proton/ProtonHandler.hpp"
+#include "proton/exceptions.hpp"
+#include "proton/Container.hpp"
+
+#include "ConnectionImpl.hpp"
+#include "Msg.hpp"
+#include "contexts.hpp"
namespace proton {
namespace reactor {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/ProtonHandler.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/ProtonHandler.cpp b/proton-c/bindings/cpp/src/ProtonHandler.cpp
index f96f5a6..d4705d5 100644
--- a/proton-c/bindings/cpp/src/ProtonHandler.cpp
+++ b/proton-c/bindings/cpp/src/ProtonHandler.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "proton/cpp/ProtonHandler.h"
-#include "proton/cpp/ProtonEvent.h"
+#include "proton/ProtonHandler.hpp"
+#include "proton/ProtonEvent.hpp"
namespace proton {
namespace reactor {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/ProtonImplRef.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/ProtonImplRef.h b/proton-c/bindings/cpp/src/ProtonImplRef.h
deleted file mode 100644
index 8f9f360..0000000
--- a/proton-c/bindings/cpp/src/ProtonImplRef.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef PROTON_CPP_PROTONIMPL_H
-#define PROTON_CPP_PROTONIMPL_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include "proton/cpp/ImportExport.h"
-#include "proton/object.h"
-
-namespace proton {
-namespace reactor {
-
-// Modified from qpid::messaging version to work without
-// boost::intrusive_ptr but integrate with Proton's pn_class_t
-// reference counting. Thread safety currently absent but fluid in
-// intention...
-
-
-/**
- * See PrivateImplRef.h This is for lightly wrapped Proton pn_object_t targets.
- * class Foo : ProtonHandle<pn_foo_t> {...}
- */
-
-template <class T> class ProtonImplRef {
- public:
- typedef typename T::Impl Impl;
-
- /** Get the implementation pointer from a handle */
- static Impl* get(const T& t) { return t.impl; }
-
- /** Set the implementation pointer in a handle */
- static void set(T& t, const Impl* p) {
- if (t.impl == p) return;
- if (t.impl) pn_decref(t.impl);
- t.impl = const_cast<Impl *>(p);
- if (t.impl) pn_incref(t.impl);
- }
-
- // Helper functions to implement the ctor, dtor, copy, assign
- static void ctor(T& t, Impl* p) { t.impl = p; if (p) pn_incref(p); }
- static void copy(T& t, const T& x) { if (&t == &x) return; t.impl = 0; assign(t, x); }
- static void dtor(T& t) { if(t.impl) pn_decref(t.impl); }
- static T& assign(T& t, const T& x) { set(t, get(x)); return t;}
-};
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_CPP_PROTONIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/ProtonImplRef.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/ProtonImplRef.hpp b/proton-c/bindings/cpp/src/ProtonImplRef.hpp
new file mode 100644
index 0000000..8621dc8
--- /dev/null
+++ b/proton-c/bindings/cpp/src/ProtonImplRef.hpp
@@ -0,0 +1,66 @@
+#ifndef PROTON_CPP_PROTONIMPL_H
+#define PROTON_CPP_PROTONIMPL_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "proton/ImportExport.hpp"
+#include "proton/object.h"
+
+namespace proton {
+namespace reactor {
+
+// Modified from qpid::messaging version to work without
+// boost::intrusive_ptr but integrate with Proton's pn_class_t
+// reference counting. Thread safety currently absent but fluid in
+// intention...
+
+
+/**
+ * See PrivateImplRef.h This is for lightly wrapped Proton pn_object_t targets.
+ * class Foo : ProtonHandle<pn_foo_t> {...}
+ */
+
+template <class T> class ProtonImplRef {
+ public:
+ typedef typename T::Impl Impl;
+
+ /** Get the implementation pointer from a handle */
+ static Impl* get(const T& t) { return t.impl; }
+
+ /** Set the implementation pointer in a handle */
+ static void set(T& t, const Impl* p) {
+ if (t.impl == p) return;
+ if (t.impl) pn_decref(t.impl);
+ t.impl = const_cast<Impl *>(p);
+ if (t.impl) pn_incref(t.impl);
+ }
+
+ // Helper functions to implement the ctor, dtor, copy, assign
+ static void ctor(T& t, Impl* p) { t.impl = p; if (p) pn_incref(p); }
+ static void copy(T& t, const T& x) { if (&t == &x) return; t.impl = 0; assign(t, x); }
+ static void dtor(T& t) { if(t.impl) pn_decref(t.impl); }
+ static T& assign(T& t, const T& x) { set(t, get(x)); return t;}
+};
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_CPP_PROTONIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Receiver.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Receiver.cpp b/proton-c/bindings/cpp/src/Receiver.cpp
index ad9a6d1..d148372 100644
--- a/proton-c/bindings/cpp/src/Receiver.cpp
+++ b/proton-c/bindings/cpp/src/Receiver.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include "proton/cpp/Link.h"
-#include "proton/cpp/Receiver.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
+#include "proton/Link.hpp"
+#include "proton/Receiver.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
#include "proton/connection.h"
#include "proton/session.h"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Sender.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Sender.cpp b/proton-c/bindings/cpp/src/Sender.cpp
index c8f962e..8c2e414 100644
--- a/proton-c/bindings/cpp/src/Sender.cpp
+++ b/proton-c/bindings/cpp/src/Sender.cpp
@@ -18,11 +18,11 @@
* under the License.
*
*/
-#include "proton/cpp/Link.h"
-#include "proton/cpp/Sender.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
-#include "contexts.h"
+#include "proton/Link.hpp"
+#include "proton/Sender.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
+#include "contexts.hpp"
#include "proton/connection.h"
#include "proton/session.h"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Session.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Session.cpp b/proton-c/bindings/cpp/src/Session.cpp
index 4333dcf..57f788e 100644
--- a/proton-c/bindings/cpp/src/Session.cpp
+++ b/proton-c/bindings/cpp/src/Session.cpp
@@ -18,14 +18,14 @@
* under the License.
*
*/
-#include "proton/cpp/Session.h"
-#include "contexts.h"
+#include "proton/Session.hpp"
+#include "contexts.hpp"
#include "proton/connection.h"
#include "proton/session.h"
-#include "proton/cpp/Session.h"
-#include "proton/cpp/Connection.h"
-#include "ConnectionImpl.h"
+#include "proton/Session.hpp"
+#include "proton/Connection.hpp"
+#include "ConnectionImpl.hpp"
namespace proton {
namespace reactor {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Terminus.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Terminus.cpp b/proton-c/bindings/cpp/src/Terminus.cpp
index f66979e..0022805 100644
--- a/proton-c/bindings/cpp/src/Terminus.cpp
+++ b/proton-c/bindings/cpp/src/Terminus.cpp
@@ -19,7 +19,7 @@
*
*/
-#include "proton/cpp/Link.h"
+#include "proton/Link.hpp"
#include "proton/link.h"
namespace proton {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Transport.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Transport.cpp b/proton-c/bindings/cpp/src/Transport.cpp
index 91eb8d9..98f03f5 100644
--- a/proton-c/bindings/cpp/src/Transport.cpp
+++ b/proton-c/bindings/cpp/src/Transport.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "proton/cpp/Transport.h"
-#include "proton/cpp/Connection.h"
+#include "proton/Transport.hpp"
+#include "proton/Connection.hpp"
#include "proton/transport.h"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Url.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Url.cpp b/proton-c/bindings/cpp/src/Url.cpp
index 058bd2f..80020fb 100644
--- a/proton-c/bindings/cpp/src/Url.cpp
+++ b/proton-c/bindings/cpp/src/Url.cpp
@@ -19,10 +19,10 @@
*
*/
-#include "proton/cpp/exceptions.h"
-#include "Url.h"
-#include "ProtonImplRef.h"
-#include "Msg.h"
+#include "proton/exceptions.hpp"
+#include "Url.hpp"
+#include "ProtonImplRef.hpp"
+#include "Msg.hpp"
namespace proton {
namespace reactor {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Url.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Url.h b/proton-c/bindings/cpp/src/Url.h
deleted file mode 100644
index d9651fc..0000000
--- a/proton-c/bindings/cpp/src/Url.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef PROTON_CPP_URL_H
-#define PROTON_CPP_URL_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "proton/cpp/ImportExport.h"
-#include "proton/cpp/ProtonHandle.h"
-#include "proton/url.h"
-#include <string>
-
-namespace proton {
-namespace reactor {
-
-class Url : public ProtonHandle<pn_url_t>
-{
- public:
- PN_CPP_EXTERN Url(const std::string &url);
- PN_CPP_EXTERN ~Url();
- PN_CPP_EXTERN Url(const Url&);
- PN_CPP_EXTERN Url& operator=(const Url&);
- PN_CPP_EXTERN std::string getHost();
- PN_CPP_EXTERN std::string getPort();
- PN_CPP_EXTERN std::string getPath();
- private:
- friend class ProtonImplRef<Url>;
-};
-
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_CPP_URL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Url.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Url.hpp b/proton-c/bindings/cpp/src/Url.hpp
new file mode 100644
index 0000000..5dfb79e
--- /dev/null
+++ b/proton-c/bindings/cpp/src/Url.hpp
@@ -0,0 +1,49 @@
+#ifndef PROTON_CPP_URL_H
+#define PROTON_CPP_URL_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "proton/ImportExport.hpp"
+#include "proton/ProtonHandle.hpp"
+#include "proton/url.h"
+#include <string>
+
+namespace proton {
+namespace reactor {
+
+class Url : public ProtonHandle<pn_url_t>
+{
+ public:
+ PN_CPP_EXTERN Url(const std::string &url);
+ PN_CPP_EXTERN ~Url();
+ PN_CPP_EXTERN Url(const Url&);
+ PN_CPP_EXTERN Url& operator=(const Url&);
+ PN_CPP_EXTERN std::string getHost();
+ PN_CPP_EXTERN std::string getPort();
+ PN_CPP_EXTERN std::string getPath();
+ private:
+ friend class ProtonImplRef<Url>;
+};
+
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_CPP_URL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Value.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Value.cpp b/proton-c/bindings/cpp/src/Value.cpp
index b488481..6d0a55c 100644
--- a/proton-c/bindings/cpp/src/Value.cpp
+++ b/proton-c/bindings/cpp/src/Value.cpp
@@ -17,8 +17,8 @@
* under the License.
*/
-#include "proton/cpp/Value.h"
-#include "proton_bits.h"
+#include "proton/Value.hpp"
+#include "proton_bits.hpp"
#include <proton/codec.h>
#include <ostream>
#include <algorithm>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/Values.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/Values.cpp b/proton-c/bindings/cpp/src/Values.cpp
index 20fb9f1..fadfacf 100644
--- a/proton-c/bindings/cpp/src/Values.cpp
+++ b/proton-c/bindings/cpp/src/Values.cpp
@@ -17,8 +17,8 @@
* under the License.
*/
-#include "proton/cpp/Value.h"
-#include "proton_bits.h"
+#include "proton/Value.hpp"
+#include "proton_bits.hpp"
#include <proton/codec.h>
#include <ostream>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingConnection.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingConnection.cpp b/proton-c/bindings/cpp/src/blocking/BlockingConnection.cpp
index 3fb6010..95499d6 100644
--- a/proton-c/bindings/cpp/src/blocking/BlockingConnection.cpp
+++ b/proton-c/bindings/cpp/src/blocking/BlockingConnection.cpp
@@ -18,14 +18,14 @@
* under the License.
*
*/
-#include "proton/cpp/Container.h"
-#include "proton/cpp/BlockingConnection.h"
-#include "proton/cpp/BlockingSender.h"
-#include "proton/cpp/MessagingHandler.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
-#include "BlockingConnectionImpl.h"
-#include "PrivateImplRef.h"
+#include "proton/Container.hpp"
+#include "proton/BlockingConnection.hpp"
+#include "proton/BlockingSender.hpp"
+#include "proton/MessagingHandler.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
+#include "BlockingConnectionImpl.hpp"
+#include "PrivateImplRef.hpp"
namespace proton {
namespace reactor {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.cpp b/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.cpp
index bdda697..7bb1261 100644
--- a/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.cpp
+++ b/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.cpp
@@ -18,14 +18,14 @@
* under the License.
*
*/
-#include "proton/cpp/Container.h"
-#include "proton/cpp/MessagingHandler.h"
-#include "proton/cpp/Duration.h"
-#include "proton/cpp/exceptions.h"
-#include "proton/cpp/WaitCondition.h"
-#include "BlockingConnectionImpl.h"
-#include "Msg.h"
-#include "contexts.h"
+#include "proton/Container.hpp"
+#include "proton/MessagingHandler.hpp"
+#include "proton/Duration.hpp"
+#include "proton/exceptions.hpp"
+#include "proton/WaitCondition.hpp"
+#include "BlockingConnectionImpl.hpp"
+#include "Msg.hpp"
+#include "contexts.hpp"
#include "proton/connection.h"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.h b/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.h
deleted file mode 100644
index 6adb65e..0000000
--- a/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef PROTON_CPP_CONNECTIONIMPL_H
-#define PROTON_CPP_CONNECTIONIMPL_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "proton/cpp/ImportExport.h"
-#include "proton/cpp/Endpoint.h"
-#include "proton/cpp/Container.h"
-#include "proton/types.h"
-#include <string>
-
-struct pn_connection_t;
-
-namespace proton {
-namespace reactor {
-
-class Handler;
-class Container;
-class SslDomain;
-
- class BlockingConnectionImpl : public MessagingHandler
-{
- public:
- PN_CPP_EXTERN BlockingConnectionImpl(std::string &url, Duration d, SslDomain *ssld, Container *c);
- PN_CPP_EXTERN ~BlockingConnectionImpl();
- PN_CPP_EXTERN void close();
- PN_CPP_EXTERN void wait(WaitCondition &condition);
- PN_CPP_EXTERN void wait(WaitCondition &condition, std::string &msg, Duration timeout);
- PN_CPP_EXTERN pn_connection_t *getPnBlockingConnection();
- Duration getTimeout() { return timeout; }
- static void incref(BlockingConnectionImpl *);
- static void decref(BlockingConnectionImpl *);
- private:
- friend class BlockingConnection;
- Container container;
- Connection connection;
- std::string url;
- Duration timeout;
- int refCount;
-};
-
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_CPP_CONNECTIONIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.hpp b/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.hpp
new file mode 100644
index 0000000..989a317
--- /dev/null
+++ b/proton-c/bindings/cpp/src/blocking/BlockingConnectionImpl.hpp
@@ -0,0 +1,63 @@
+#ifndef PROTON_CPP_CONNECTIONIMPL_H
+#define PROTON_CPP_CONNECTIONIMPL_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "proton/ImportExport.hpp"
+#include "proton/Endpoint.hpp"
+#include "proton/Container.hpp"
+#include "proton/types.h"
+#include <string>
+
+struct pn_connection_t;
+
+namespace proton {
+namespace reactor {
+
+class Handler;
+class Container;
+class SslDomain;
+
+ class BlockingConnectionImpl : public MessagingHandler
+{
+ public:
+ PN_CPP_EXTERN BlockingConnectionImpl(std::string &url, Duration d, SslDomain *ssld, Container *c);
+ PN_CPP_EXTERN ~BlockingConnectionImpl();
+ PN_CPP_EXTERN void close();
+ PN_CPP_EXTERN void wait(WaitCondition &condition);
+ PN_CPP_EXTERN void wait(WaitCondition &condition, std::string &msg, Duration timeout);
+ PN_CPP_EXTERN pn_connection_t *getPnBlockingConnection();
+ Duration getTimeout() { return timeout; }
+ static void incref(BlockingConnectionImpl *);
+ static void decref(BlockingConnectionImpl *);
+ private:
+ friend class BlockingConnection;
+ Container container;
+ Connection connection;
+ std::string url;
+ Duration timeout;
+ int refCount;
+};
+
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_CPP_CONNECTIONIMPL_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingLink.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingLink.cpp b/proton-c/bindings/cpp/src/blocking/BlockingLink.cpp
index 5a572ae..9dfc844 100644
--- a/proton-c/bindings/cpp/src/blocking/BlockingLink.cpp
+++ b/proton-c/bindings/cpp/src/blocking/BlockingLink.cpp
@@ -18,12 +18,12 @@
* under the License.
*
*/
-#include "proton/cpp/BlockingLink.h"
-#include "proton/cpp/BlockingConnection.h"
-#include "proton/cpp/MessagingHandler.h"
-#include "proton/cpp/WaitCondition.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
+#include "proton/BlockingLink.hpp"
+#include "proton/BlockingConnection.hpp"
+#include "proton/MessagingHandler.hpp"
+#include "proton/WaitCondition.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
namespace proton {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/blocking/BlockingSender.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/blocking/BlockingSender.cpp b/proton-c/bindings/cpp/src/blocking/BlockingSender.cpp
index dc6b9bd..ac37477 100644
--- a/proton-c/bindings/cpp/src/blocking/BlockingSender.cpp
+++ b/proton-c/bindings/cpp/src/blocking/BlockingSender.cpp
@@ -18,11 +18,11 @@
* under the License.
*
*/
-#include "proton/cpp/BlockingSender.h"
-#include "proton/cpp/BlockingConnection.h"
-#include "proton/cpp/WaitCondition.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
+#include "proton/BlockingSender.hpp"
+#include "proton/BlockingConnection.hpp"
+#include "proton/WaitCondition.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
namespace proton {
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/contexts.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/contexts.cpp b/proton-c/bindings/cpp/src/contexts.cpp
index 56483ff..28f4778 100644
--- a/proton-c/bindings/cpp/src/contexts.cpp
+++ b/proton-c/bindings/cpp/src/contexts.cpp
@@ -19,9 +19,9 @@
*
*/
-#include "contexts.h"
-#include "proton/cpp/exceptions.h"
-#include "Msg.h"
+#include "contexts.hpp"
+#include "proton/exceptions.hpp"
+#include "Msg.hpp"
#include "proton/object.h"
#include "proton/message.h"
#include "proton/session.h"
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/contexts.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/contexts.h b/proton-c/bindings/cpp/src/contexts.h
deleted file mode 100644
index e1b5f24..0000000
--- a/proton-c/bindings/cpp/src/contexts.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef PROTON_CPP_CONTEXTS_H
-#define PROTON_CPP_CONTEXTS_H
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include "proton/reactor.h"
-#include "proton/connection.h"
-#include "proton/message.h"
-
-namespace proton {
-namespace reactor {
-
-class ConnectionImpl;
-void setConnectionContext(pn_connection_t *pnConnection, ConnectionImpl *connection);
-ConnectionImpl *getConnectionContext(pn_connection_t *pnConnection);
-
-class Session;
-void setSessionContext(pn_session_t *pnSession, Session *session);
-Session *getSessionContext(pn_session_t *pnSession);
-
-class Link;
-void setLinkContext(pn_link_t *pnLink, Link *link);
-Link *getLinkContext(pn_link_t *pnLink);
-
-class ContainerImpl;
-void setContainerContext(pn_reactor_t *pnReactor, ContainerImpl *container);
-ContainerImpl *getContainerContext(pn_reactor_t *pnReactor);
-
-void setEventContext(pn_event_t *pnEvent, pn_message_t *m);
-pn_message_t *getEventContext(pn_event_t *pnEvent);
-
-}} // namespace proton::reactor
-
-#endif /*!PROTON_CPP_CONTEXTS_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/contexts.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/contexts.hpp b/proton-c/bindings/cpp/src/contexts.hpp
new file mode 100644
index 0000000..e1b5f24
--- /dev/null
+++ b/proton-c/bindings/cpp/src/contexts.hpp
@@ -0,0 +1,52 @@
+#ifndef PROTON_CPP_CONTEXTS_H
+#define PROTON_CPP_CONTEXTS_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "proton/reactor.h"
+#include "proton/connection.h"
+#include "proton/message.h"
+
+namespace proton {
+namespace reactor {
+
+class ConnectionImpl;
+void setConnectionContext(pn_connection_t *pnConnection, ConnectionImpl *connection);
+ConnectionImpl *getConnectionContext(pn_connection_t *pnConnection);
+
+class Session;
+void setSessionContext(pn_session_t *pnSession, Session *session);
+Session *getSessionContext(pn_session_t *pnSession);
+
+class Link;
+void setLinkContext(pn_link_t *pnLink, Link *link);
+Link *getLinkContext(pn_link_t *pnLink);
+
+class ContainerImpl;
+void setContainerContext(pn_reactor_t *pnReactor, ContainerImpl *container);
+ContainerImpl *getContainerContext(pn_reactor_t *pnReactor);
+
+void setEventContext(pn_event_t *pnEvent, pn_message_t *m);
+pn_message_t *getEventContext(pn_event_t *pnEvent);
+
+}} // namespace proton::reactor
+
+#endif /*!PROTON_CPP_CONTEXTS_H*/
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/interop_test.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/interop_test.cpp b/proton-c/bindings/cpp/src/interop_test.cpp
index d7bef51..122e983 100644
--- a/proton-c/bindings/cpp/src/interop_test.cpp
+++ b/proton-c/bindings/cpp/src/interop_test.cpp
@@ -17,10 +17,10 @@
* under the License.
*/
-#include "proton/cpp/Decoder.h"
-#include "proton/cpp/Encoder.h"
-#include "proton/cpp/Value.h"
-#include "./Msg.h"
+#include "proton/Decoder.hpp"
+#include "proton/Encoder.hpp"
+#include "proton/Value.hpp"
+#include "Msg.hpp"
#include <stdexcept>
#include <string>
#include <sstream>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/proton_bits.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proton_bits.cpp b/proton-c/bindings/cpp/src/proton_bits.cpp
index 10f7c59..6a85b1d 100644
--- a/proton-c/bindings/cpp/src/proton_bits.cpp
+++ b/proton-c/bindings/cpp/src/proton_bits.cpp
@@ -21,7 +21,7 @@
#include <ostream>
#include <proton/error.h>
#include <proton/object.h>
-#include "proton_bits.h"
+#include "proton_bits.hpp"
std::string errorStr(int code) {
switch (code)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/proton_bits.h
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proton_bits.h b/proton-c/bindings/cpp/src/proton_bits.h
deleted file mode 100644
index e57f188..0000000
--- a/proton-c/bindings/cpp/src/proton_bits.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef ERROR_H
-#define ERROR_H
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <iosfwd>
-#include <proton/error.h>
-
-/**@file
- *
- * Assorted internal proton utilities.
- */
-
-std::string errorStr(int code);
-
-/** Print the error string from pn_error_t, or from code if pn_error_t has no error. */
-std::string errorStr(pn_error_t*, int code=0);
-
-/** Wrapper for a proton object pointer. */
-struct Object { void* value; Object(void* o) : value(o) {} };
-
-/** Stream a proton object via pn_inspect. */
-std::ostream& operator<<(std::ostream& o, const Object& object);
-
-
-
-
-#endif // ERROR_H
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/proton_bits.hpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/proton_bits.hpp b/proton-c/bindings/cpp/src/proton_bits.hpp
new file mode 100644
index 0000000..e57f188
--- /dev/null
+++ b/proton-c/bindings/cpp/src/proton_bits.hpp
@@ -0,0 +1,44 @@
+#ifndef ERROR_H
+#define ERROR_H
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <iosfwd>
+#include <proton/error.h>
+
+/**@file
+ *
+ * Assorted internal proton utilities.
+ */
+
+std::string errorStr(int code);
+
+/** Print the error string from pn_error_t, or from code if pn_error_t has no error. */
+std::string errorStr(pn_error_t*, int code=0);
+
+/** Wrapper for a proton object pointer. */
+struct Object { void* value; Object(void* o) : value(o) {} };
+
+/** Stream a proton object via pn_inspect. */
+std::ostream& operator<<(std::ostream& o, const Object& object);
+
+
+
+
+#endif // ERROR_H
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38f57e9d/proton-c/bindings/cpp/src/types.cpp
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/src/types.cpp b/proton-c/bindings/cpp/src/types.cpp
index 4f2c6ac..1998b97 100644
--- a/proton-c/bindings/cpp/src/types.cpp
+++ b/proton-c/bindings/cpp/src/types.cpp
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "proton/cpp/types.h"
+#include "proton/types.hpp"
#include <proton/codec.h>
#include <ostream>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org