Run of fresh-releases for mathic

Merge these changes:

git pull https://janitor.debian.net/git/mathic fresh-releases/main
git pull https://janitor.debian.net/git/mathic fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/mathic fresh-releases/upstream

Summary

Merged new upstream version: 1.0~git20220426 (was: 1.0~git20220218).

Diff

Branch: main

diff --git a/Makefile.am b/Makefile.am
index 8d06472..f6d4a15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ libmathic_la_CPPFLAGS = $(DEPS_CFLAGS)
 lib_LTLIBRARIES = libmathic.la
 
 # set the C++ compiler to include src/
-AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
+AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++14
 
 # libraries that are needed by this library
 libmathic_la_LIBADD= $(DEPS_LIBS)
@@ -85,7 +85,7 @@ if with_gtest
 TESTS=unittest
 check_PROGRAMS=$(TESTS)
 
-unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
+unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++14
 unittest_LDADD = $(top_builddir)/libmathic.la $(DEPS_LIBS) -lmemtailor -lpthread
 unittest_CPPFLAGS = $(DEPS_CFLAGS)
 
diff --git a/debian/changelog b/debian/changelog
index 7f5a6eb..4bdcf57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mathic (1.0~git20220426-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Thu, 05 May 2022 12:31:07 -0000
+
 mathic (1.0~git20220218-1) unstable; urgency=medium
 
   * New upstream release (git snapshot).
diff --git a/src/mathic/Geobucket.h b/src/mathic/Geobucket.h
index 0223a0c..ae90620 100644
--- a/src/mathic/Geobucket.h
+++ b/src/mathic/Geobucket.h
@@ -773,11 +773,12 @@ namespace mathic {
   template<class C>
   Geobucket<C>::Bucket::Bucket
 	(size_t capacity, Entry* buffer, Entry* otherBuffer):
-  _frontPos(0),
-	_otherBuffer(otherBuffer),
-	_begin(buffer),
-	_size(0),
-	_capacity(capacity) {
+        _frontPos(0),
+        _otherBuffer(otherBuffer),
+        _back(),
+        _begin(buffer),
+        _size(0),
+        _capacity(capacity) {
 	  MATHIC_ASSERT(C::bucketStorage == GeoStoreDoubleBuffer ?
 			 otherBuffer != 0 : otherBuffer == 0);
 	}
diff --git a/src/mathic/error.cpp b/src/mathic/error.cpp
index bd4d518..baa8ae9 100644
--- a/src/mathic/error.cpp
+++ b/src/mathic/error.cpp
@@ -2,15 +2,15 @@
 #include <sstream>
 
 namespace mathic {
-  void reportError(const std::string& errorMsg) {
+  void reportError [[noreturn]] (const std::string& errorMsg) {
     throw MathicException("ERROR: " + errorMsg);
   }
 
-  void reportInternalError(const std::string& errorMsg) {
+  void reportInternalError [[noreturn]] (const std::string& errorMsg) {
     throw InternalMathicException("INTERNAL ERROR: " + errorMsg);
   }
 
-  void reportInternalError
+  void reportInternalError [[noreturn]]
   (const std::string& errorMsg, const char* file, unsigned int lineNumber) {
 
     std::ostringstream err;
diff --git a/src/mathic/error.h b/src/mathic/error.h
index 6c9353b..26be0d2 100644
--- a/src/mathic/error.h
+++ b/src/mathic/error.h
@@ -18,26 +18,19 @@ namespace mathic {
     InternalMathicException(const std::string& str): logic_error(str) {}
   };
 
-  // The do {...} while (0) is to collect everything into a single
-  // statement that still requires a semicolon after it. The throw is to
-  // prevent spurious compiler warnings about a missing return
-  // statement.
   #define MATHIC_INTERNAL_ERROR(msg) \
-    do { \
-      reportInternalError(msg, __FILE__, __LINE__); \
-      throw; \
-    } while (false)
+    reportInternalError(msg, __FILE__, __LINE__)
   #define INTERNAL_ERROR_UNIMPLEMENTED() \
     INTERNAL_ERROR("Called function that has not been implemented.")
 
   // These methods throw exceptions.
-  void reportError(const std::string& errorMsg);
-  void reportInternalError(const std::string& errorMsg);
-  void reportInternalError
+  void reportError [[noreturn]] (const std::string& errorMsg);
+  void reportInternalError [[noreturn]] (const std::string& errorMsg);
+  void reportInternalError [[noreturn]]
   (const std::string& errorMsg, const char* file, unsigned int lineNumber);
 
   template<class Exception>
-  void throwError(const std::string& errorMsg) {
+  void throwError [[noreturn]] (const std::string& errorMsg) {
     throw Exception("ERROR: " + errorMsg + '\n');
   }
 

Branch: pristine-tar

diff --git a/mathic_1.0~git20220426.orig.tar.xz.delta b/mathic_1.0~git20220426.orig.tar.xz.delta
new file mode 100644
index 0000000..bf23669
Binary files /dev/null and b/mathic_1.0~git20220426.orig.tar.xz.delta differ
diff --git a/mathic_1.0~git20220426.orig.tar.xz.id b/mathic_1.0~git20220426.orig.tar.xz.id
new file mode 100644
index 0000000..13057fc
--- /dev/null
+++ b/mathic_1.0~git20220426.orig.tar.xz.id
@@ -0,0 +1 @@
+75725bed4fd33654e2a2f01158ad7a15a4148ef1

Branch: upstream

Tag: upstream/1.0_git20220426
diff --git a/Makefile.am b/Makefile.am
index 8d06472..f6d4a15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ libmathic_la_CPPFLAGS = $(DEPS_CFLAGS)
 lib_LTLIBRARIES = libmathic.la
 
 # set the C++ compiler to include src/
-AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++0x
+AM_CXXFLAGS=-I$(top_srcdir)/src/ -std=gnu++14
 
 # libraries that are needed by this library
 libmathic_la_LIBADD= $(DEPS_LIBS)
@@ -85,7 +85,7 @@ if with_gtest
 TESTS=unittest
 check_PROGRAMS=$(TESTS)
 
-unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++0x
+unittest_CXXFLAGS = -I$(top_srcdir)/src/ -std=gnu++14
 unittest_LDADD = $(top_builddir)/libmathic.la $(DEPS_LIBS) -lmemtailor -lpthread
 unittest_CPPFLAGS = $(DEPS_CFLAGS)
 
diff --git a/src/mathic/Geobucket.h b/src/mathic/Geobucket.h
index 0223a0c..ae90620 100644
--- a/src/mathic/Geobucket.h
+++ b/src/mathic/Geobucket.h
@@ -773,11 +773,12 @@ namespace mathic {
   template<class C>
   Geobucket<C>::Bucket::Bucket
 	(size_t capacity, Entry* buffer, Entry* otherBuffer):
-  _frontPos(0),
-	_otherBuffer(otherBuffer),
-	_begin(buffer),
-	_size(0),
-	_capacity(capacity) {
+        _frontPos(0),
+        _otherBuffer(otherBuffer),
+        _back(),
+        _begin(buffer),
+        _size(0),
+        _capacity(capacity) {
 	  MATHIC_ASSERT(C::bucketStorage == GeoStoreDoubleBuffer ?
 			 otherBuffer != 0 : otherBuffer == 0);
 	}
diff --git a/src/mathic/error.cpp b/src/mathic/error.cpp
index bd4d518..baa8ae9 100644
--- a/src/mathic/error.cpp
+++ b/src/mathic/error.cpp
@@ -2,15 +2,15 @@
 #include <sstream>
 
 namespace mathic {
-  void reportError(const std::string& errorMsg) {
+  void reportError [[noreturn]] (const std::string& errorMsg) {
     throw MathicException("ERROR: " + errorMsg);
   }
 
-  void reportInternalError(const std::string& errorMsg) {
+  void reportInternalError [[noreturn]] (const std::string& errorMsg) {
     throw InternalMathicException("INTERNAL ERROR: " + errorMsg);
   }
 
-  void reportInternalError
+  void reportInternalError [[noreturn]]
   (const std::string& errorMsg, const char* file, unsigned int lineNumber) {
 
     std::ostringstream err;
diff --git a/src/mathic/error.h b/src/mathic/error.h
index 6c9353b..26be0d2 100644
--- a/src/mathic/error.h
+++ b/src/mathic/error.h
@@ -18,26 +18,19 @@ namespace mathic {
     InternalMathicException(const std::string& str): logic_error(str) {}
   };
 
-  // The do {...} while (0) is to collect everything into a single
-  // statement that still requires a semicolon after it. The throw is to
-  // prevent spurious compiler warnings about a missing return
-  // statement.
   #define MATHIC_INTERNAL_ERROR(msg) \
-    do { \
-      reportInternalError(msg, __FILE__, __LINE__); \
-      throw; \
-    } while (false)
+    reportInternalError(msg, __FILE__, __LINE__)
   #define INTERNAL_ERROR_UNIMPLEMENTED() \
     INTERNAL_ERROR("Called function that has not been implemented.")
 
   // These methods throw exceptions.
-  void reportError(const std::string& errorMsg);
-  void reportInternalError(const std::string& errorMsg);
-  void reportInternalError
+  void reportError [[noreturn]] (const std::string& errorMsg);
+  void reportInternalError [[noreturn]] (const std::string& errorMsg);
+  void reportInternalError [[noreturn]]
   (const std::string& errorMsg, const char* file, unsigned int lineNumber);
 
   template<class Exception>
-  void throwError(const std::string& errorMsg) {
+  void throwError [[noreturn]] (const std::string& errorMsg) {
     throw Exception("ERROR: " + errorMsg + '\n');
   }
 

Publish Blockers

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases libmathic-devapt install -t fresh-releases libmathic0v5-dbgsymapt install -t fresh-releases libmathic0v5

Lintian Result

Full worker log Full build log