| commit | 8c3aa3a5155432b5a94ff830481f0663caddce89 | [log] [tgz] |
|---|---|---|
| author | aboutros <adel.boutros@murex.com> | Fri Oct 07 12:26:10 2016 +0200 |
| committer | Alan Conway <aconway@redhat.com> | Thu Oct 20 08:13:52 2016 -0400 |
| tree | e433d62777a73346dcdfe98dd2fce19edb565313 | |
| parent | 795278665fc90b96ec1091e878972b9112f91569 [diff] |
PROTON-1319: C++ SunStudo: Move internal header files of cpp bindings Sun compiler searches all include paths to build template-DB, creates problems if from src files are in the path. Signed-off-by: aboutros <adel.boutros@murex.com>
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt index 7709bae..ed969eb 100644 --- a/proton-c/bindings/cpp/CMakeLists.txt +++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories( "${CMAKE_SOURCE_DIR}/proton-c/include" "${CMAKE_CURRENT_SOURCE_DIR}/include" - "${CMAKE_CURRENT_SOURCE_DIR}/src") + "${CMAKE_CURRENT_SOURCE_DIR}/src/include") add_definitions(${CXX_WARNING_FLAGS})
diff --git a/proton-c/bindings/cpp/src/acceptor.hpp b/proton-c/bindings/cpp/src/include/acceptor.hpp similarity index 100% rename from proton-c/bindings/cpp/src/acceptor.hpp rename to proton-c/bindings/cpp/src/include/acceptor.hpp
diff --git a/proton-c/bindings/cpp/src/connector.hpp b/proton-c/bindings/cpp/src/include/connector.hpp similarity index 100% rename from proton-c/bindings/cpp/src/connector.hpp rename to proton-c/bindings/cpp/src/include/connector.hpp
diff --git a/proton-c/bindings/cpp/src/container_impl.hpp b/proton-c/bindings/cpp/src/include/container_impl.hpp similarity index 100% rename from proton-c/bindings/cpp/src/container_impl.hpp rename to proton-c/bindings/cpp/src/include/container_impl.hpp
diff --git a/proton-c/bindings/cpp/src/contexts.hpp b/proton-c/bindings/cpp/src/include/contexts.hpp similarity index 100% rename from proton-c/bindings/cpp/src/contexts.hpp rename to proton-c/bindings/cpp/src/include/contexts.hpp
diff --git a/proton-c/bindings/cpp/src/messaging_adapter.hpp b/proton-c/bindings/cpp/src/include/messaging_adapter.hpp similarity index 100% rename from proton-c/bindings/cpp/src/messaging_adapter.hpp rename to proton-c/bindings/cpp/src/include/messaging_adapter.hpp
diff --git a/proton-c/bindings/cpp/src/msg.hpp b/proton-c/bindings/cpp/src/include/msg.hpp similarity index 100% rename from proton-c/bindings/cpp/src/msg.hpp rename to proton-c/bindings/cpp/src/include/msg.hpp
diff --git a/proton-c/bindings/cpp/src/proton_bits.hpp b/proton-c/bindings/cpp/src/include/proton_bits.hpp similarity index 100% rename from proton-c/bindings/cpp/src/proton_bits.hpp rename to proton-c/bindings/cpp/src/include/proton_bits.hpp
diff --git a/proton-c/bindings/cpp/src/proton_event.hpp b/proton-c/bindings/cpp/src/include/proton_event.hpp similarity index 100% rename from proton-c/bindings/cpp/src/proton_event.hpp rename to proton-c/bindings/cpp/src/include/proton_event.hpp
diff --git a/proton-c/bindings/cpp/src/proton_handler.hpp b/proton-c/bindings/cpp/src/include/proton_handler.hpp similarity index 100% rename from proton-c/bindings/cpp/src/proton_handler.hpp rename to proton-c/bindings/cpp/src/include/proton_handler.hpp
diff --git a/proton-c/bindings/cpp/src/reactor.hpp b/proton-c/bindings/cpp/src/include/reactor.hpp similarity index 100% rename from proton-c/bindings/cpp/src/reactor.hpp rename to proton-c/bindings/cpp/src/include/reactor.hpp
diff --git a/proton-c/bindings/cpp/src/scalar_test.hpp b/proton-c/bindings/cpp/src/include/scalar_test.hpp similarity index 100% rename from proton-c/bindings/cpp/src/scalar_test.hpp rename to proton-c/bindings/cpp/src/include/scalar_test.hpp
diff --git a/proton-c/bindings/cpp/src/test_bits.hpp b/proton-c/bindings/cpp/src/include/test_bits.hpp similarity index 100% rename from proton-c/bindings/cpp/src/test_bits.hpp rename to proton-c/bindings/cpp/src/include/test_bits.hpp
diff --git a/proton-c/bindings/cpp/src/test_dummy_container.hpp b/proton-c/bindings/cpp/src/include/test_dummy_container.hpp similarity index 100% rename from proton-c/bindings/cpp/src/test_dummy_container.hpp rename to proton-c/bindings/cpp/src/include/test_dummy_container.hpp
diff --git a/proton-c/bindings/cpp/src/types_internal.hpp b/proton-c/bindings/cpp/src/include/types_internal.hpp similarity index 98% rename from proton-c/bindings/cpp/src/types_internal.hpp rename to proton-c/bindings/cpp/src/include/types_internal.hpp index 484dfc4..bff93a0 100644 --- a/proton-c/bindings/cpp/src/types_internal.hpp +++ b/proton-c/bindings/cpp/src/include/types_internal.hpp
@@ -66,7 +66,7 @@ ~ios_guard() { guarded.copyfmt(old); } }; -// Convert a char (signed or unsigned) into an unsigned 1 byte integer that will ostream +// Convert a char (signed or unsigned) into an unsigned 1 byte integer that will ostream // as a numeric byte value, not a character and will not get sign-extended. inline unsigned int printable_byte(uint8_t byte) { return byte; }