[protozero] 01/04: Imported Upstream version 1.2.2
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Oct 13 07:14:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository protozero.
commit 2a56177d67a4a8dcd8097a49d2aaa5ed4a0a6672
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Oct 13 09:08:04 2015 +0200
Imported Upstream version 1.2.2
---
CHANGELOG.md | 10 +++++++++-
include/protozero/pbf_writer.hpp | 4 +++-
include/protozero/version.hpp | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2649f89..07f64bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
+## [1.2.2] - 2015-10-13
+
+### Fixed
+
+- Fix the recently broken writing of bools on big-endian architectures.
+
+
## [1.2.1] - 2015-10-12
### Fixed
@@ -41,7 +48,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Make pbf reader and writer code endianess-aware.
-[unreleased]: https://github.com/osmcode/libosmium/compare/v1.2.1...HEAD
+[unreleased]: https://github.com/osmcode/libosmium/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/osmcode/libosmium/compare/v1.2.1...v1.2.2
[1.2.1]: https://github.com/osmcode/libosmium/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/osmcode/libosmium/compare/v1.1.0...v1.2.0
[1.1.0]: https://github.com/osmcode/libosmium/compare/v1.0.0...v1.1.0
diff --git a/include/protozero/pbf_writer.hpp b/include/protozero/pbf_writer.hpp
index 53cbfdf..e4e02de 100644
--- a/include/protozero/pbf_writer.hpp
+++ b/include/protozero/pbf_writer.hpp
@@ -229,7 +229,9 @@ public:
*/
inline void add_bool(pbf_tag_type tag, bool value) {
add_field(tag, pbf_wire_type::varint);
- add_fixed<char>(value);
+ protozero_assert(m_pos == 0 && "you can't add fields to a parent pbf_writer if there is an existing pbf_writer for a submessage");
+ protozero_assert(m_data);
+ m_data->append(1, value);
}
/**
diff --git a/include/protozero/version.hpp b/include/protozero/version.hpp
index 1d82b7a..f11d303 100644
--- a/include/protozero/version.hpp
+++ b/include/protozero/version.hpp
@@ -12,11 +12,11 @@ documentation.
#define PROTOZERO_VERSION_MAJOR 1
#define PROTOZERO_VERSION_MINOR 2
-#define PROTOZERO_VERSION_PATCH 1
+#define PROTOZERO_VERSION_PATCH 2
#define PROTOZERO_VERSION_CODE (PROTOZERO_VERSION_MAJOR * 10000 + PROTOZERO_VERSION_MINOR * 100 + PROTOZERO_VERSION_PATCH)
-#define PROTOZERO_VERSION_STRING "1.2.1"
+#define PROTOZERO_VERSION_STRING "1.2.2"
#endif // PROTOZERO_VERSION_HPP
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/protozero.git
More information about the Pkg-grass-devel
mailing list