You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/08/11 07:57:51 UTC
[avro] 01/01: AVRO-3601: C++ API header contains breaking include
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch avro-3601-c++-api-include
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 56eea3331a3aedb4a5889faf8799b6a5f36af9e8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Aug 11 10:55:14 2022 +0300
AVRO-3601: C++ API header contains breaking include
Move impl/json/JsonDom.hh to api/json/
https://github.com/apache/avro/blob/ce2439d7a7669a5c7f2fa555c661770fbe67493a/lang/c%2B%2B/CMakeLists.txt#L97
includes the 'api/' folder, CMAKE_CURRENT_BINARY_DIR and Boost's
include dirs
Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
lang/c++/api/CustomFields.hh | 2 +-
lang/c++/{impl => api}/json/JsonDom.hh | 0
lang/c++/impl/json/JsonDom.cc | 2 +-
lang/c++/test/JsonTests.cc | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/c++/api/CustomFields.hh b/lang/c++/api/CustomFields.hh
index 01468ff4a..3884c5c62 100644
--- a/lang/c++/api/CustomFields.hh
+++ b/lang/c++/api/CustomFields.hh
@@ -21,7 +21,7 @@
#include <iostream>
-#include "../impl/json/JsonDom.hh"
+#include "./json/JsonDom.hh"
namespace avro {
diff --git a/lang/c++/impl/json/JsonDom.hh b/lang/c++/api/json/JsonDom.hh
similarity index 100%
rename from lang/c++/impl/json/JsonDom.hh
rename to lang/c++/api/json/JsonDom.hh
diff --git a/lang/c++/impl/json/JsonDom.cc b/lang/c++/impl/json/JsonDom.cc
index 5bffda255..a6282e5a1 100644
--- a/lang/c++/impl/json/JsonDom.cc
+++ b/lang/c++/impl/json/JsonDom.cc
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-#include "JsonDom.hh"
+#include "../../api/json/JsonDom.hh"
#include <stdexcept>
diff --git a/lang/c++/test/JsonTests.cc b/lang/c++/test/JsonTests.cc
index 3832e6913..28ac03c5c 100644
--- a/lang/c++/test/JsonTests.cc
+++ b/lang/c++/test/JsonTests.cc
@@ -22,7 +22,7 @@
#include <boost/test/parameterized_test.hpp>
#include <boost/test/unit_test.hpp>
-#include "../impl/json/JsonDom.hh"
+#include "../api/json/JsonDom.hh"
namespace avro {
namespace json {