CMakeLists.txt

@@ -41,8 +41,10 @@ endif()
 if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
   if (MSVC)
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:precise")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11")
   else ()
     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fp-model precise")
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
   endif ()
 endif ()
 

debian/changelog

+proj (5.2.0~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Drop patches, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 13 Sep 2018 07:22:54 +0200
+
 proj (5.2.0~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.

debian/patches/dont-install-gtest.patch

-Description: Don't install gtest libraries.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/1115
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/163cb3750a1c149dc4be3f47a6fd505fb5e4ef1a
-
---- a/test/googletest/Makefile.am
-+++ b/test/googletest/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = src include
- 
- AM_CPPFLAGS = -I$(top_srcdir)/test/googletest/include
- 
--lib_LTLIBRARIES = libgtest.la
-+noinst_LTLIBRARIES = libgtest.la
- 
- libgtest_la_LDFLAGS = -no-undefined
- libgtest_la_SOURCES = src/gtest-all.cc

debian/patches/dont-install-test-executables.patch

-Description: Don't install test executables.
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/1116
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/4fe0d9ae1e4228c3966f413bd16702ef1f6d84f8
-
---- a/test/unit/Makefile.am
-+++ b/test/unit/Makefile.am
-@@ -7,9 +7,9 @@ noinst_HEADERS = gtest_include.h
- AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/test/googletest/include
- AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@
- 
--bin_PROGRAMS = basic_test
--bin_PROGRAMS += pj_phi2_test
--bin_PROGRAMS += proj_errno_string_test
-+noinst_PROGRAMS = basic_test
-+noinst_PROGRAMS += pj_phi2_test
-+noinst_PROGRAMS += proj_errno_string_test
- 
- basic_test_SOURCES = basic_test.cpp main.cpp
- basic_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la

debian/patches/series

-soname.patch
-dont-install-gtest.patch
-dont-install-test-executables.patch

debian/patches/soname.patch

-Description: Fix SONAME decrement from libproj.so.13 to libproj.so.12.
- Increment age instead of revision for added interfaces, see:
-  https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/1114
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/3de3061055edcf8992ecc4f3626c11d2b13c1c1e
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,7 +41,7 @@ geodtest_LDADD = libproj.la
- 
- lib_LTLIBRARIES = libproj.la
- 
--libproj_la_LDFLAGS = -no-undefined -version-info 14:0:2
-+libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1
- 
- libproj_la_SOURCES = \
- 	pj_list.h proj_internal.h proj_math.h\

src/Makefile.am

@@ -41,7 +41,7 @@ geodtest_LDADD = libproj.la
 
 lib_LTLIBRARIES = libproj.la
 
-libproj_la_LDFLAGS = -no-undefined -version-info 14:0:2
+libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1
 
 libproj_la_SOURCES = \
 	pj_list.h proj_internal.h proj_math.h\

src/Makefile.in

@@ -722,7 +722,7 @@ multistresstest_LDADD = libproj.la @THREAD_LIB@
 test228_LDADD = libproj.la @THREAD_LIB@
 geodtest_LDADD = libproj.la
 lib_LTLIBRARIES = libproj.la
-libproj_la_LDFLAGS = -no-undefined -version-info 14:0:2
+libproj_la_LDFLAGS = -no-undefined -version-info 14:1:1
 libproj_la_SOURCES = \
 	pj_list.h proj_internal.h proj_math.h\
 	PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \

src/pj_release.c

@@ -11,7 +11,7 @@ char const pj_release[] =
     STR(PROJ_VERSION_MAJOR)"."
     STR(PROJ_VERSION_MINOR)"."
     STR(PROJ_VERSION_PATCH)", "
-    "September 1st, 2018";
+    "September 15th, 2018";
 
 const char *pj_get_release() {
     return pj_release;

test/googletest/Makefile.am

@@ -4,7 +4,7 @@ SUBDIRS = src include
 
 AM_CPPFLAGS = -I$(top_srcdir)/test/googletest/include
 
-lib_LTLIBRARIES = libgtest.la
+noinst_LTLIBRARIES = libgtest.la
 
 libgtest_la_LDFLAGS = -no-undefined
 libgtest_la_SOURCES = src/gtest-all.cc

test/googletest/Makefile.in

@@ -104,35 +104,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/proj_config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
 libgtest_la_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
 am_libgtest_la_OBJECTS = src/gtest-all.lo
@@ -379,7 +351,7 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = src include
 AM_CPPFLAGS = -I$(top_srcdir)/test/googletest/include
-lib_LTLIBRARIES = libgtest.la
+noinst_LTLIBRARIES = libgtest.la
 libgtest_la_LDFLAGS = -no-undefined
 libgtest_la_SOURCES = src/gtest-all.cc
 EXTRA_DIST = CMakeLists.txt.in
@@ -417,33 +389,9 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
@@ -460,7 +408,7 @@ src/$(DEPDIR)/$(am__dirstamp):
 src/gtest-all.lo: src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 
 libgtest.la: $(libgtest_la_OBJECTS) $(libgtest_la_DEPENDENCIES) $(EXTRA_libgtest_la_DEPENDENCIES) 
-	$(AM_V_CXXLD)$(libgtest_la_LINK) -rpath $(libdir) $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
+	$(AM_V_CXXLD)$(libgtest_la_LINK)  $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -671,9 +619,6 @@ check: check-recursive
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -708,7 +653,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -735,7 +680,7 @@ install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
 
 install-html: install-html-recursive
 
@@ -775,25 +720,24 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--depfiles check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-libLTLIBRARIES
+	am--depfiles check check-am clean clean-generic clean-libtool \
+	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 .PRECIOUS: Makefile
 

test/unit/Makefile.am

@@ -7,9 +7,9 @@ noinst_HEADERS = gtest_include.h
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/test/googletest/include
 AM_CXXFLAGS = @CXX_WFLAGS@ @NO_ZERO_AS_NULL_POINTER_CONSTANT_FLAG@
 
-bin_PROGRAMS = basic_test
-bin_PROGRAMS += pj_phi2_test
-bin_PROGRAMS += proj_errno_string_test
+noinst_PROGRAMS = basic_test
+noinst_PROGRAMS += pj_phi2_test
+noinst_PROGRAMS += proj_errno_string_test
 
 basic_test_SOURCES = basic_test.cpp main.cpp
 basic_test_LDADD = ../../src/libproj.la ../../test/googletest/libgtest.la

test/unit/Makefile.in

@@ -89,7 +89,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = basic_test$(EXEEXT) pj_phi2_test$(EXEEXT) \
+noinst_PROGRAMS = basic_test$(EXEEXT) pj_phi2_test$(EXEEXT) \
 	proj_errno_string_test$(EXEEXT)
 subdir = test/unit
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -108,8 +108,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/proj_config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
+PROGRAMS = $(noinst_PROGRAMS)
 am_basic_test_OBJECTS = basic_test.$(OBJEXT) main.$(OBJEXT)
 basic_test_OBJECTS = $(am_basic_test_OBJECTS)
 basic_test_DEPENDENCIES = ../../src/libproj.la \
@@ -366,49 +365,9 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	 || test -f $$p1 \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
@@ -565,9 +524,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -600,7 +556,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-am
 		-rm -f ./$(DEPDIR)/basic_test.Po
@@ -629,7 +586,7 @@ install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am:
 
 install-html: install-html-am
 
@@ -672,24 +629,23 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am \
-	check-local clean clean-binPROGRAMS clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
+	check-local clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 

test/unit/pj_phi2_test.cpp

@@ -64,13 +64,13 @@ TEST(PjPhi2Test, Basic) {
 TEST(PjPhi2Test, AvoidUndefinedBehavior) {
     auto ctx = pj_get_default_ctx();
 
-    constexpr auto nan = std::numeric_limits<double>::quiet_NaN();
+    const auto nan = std::numeric_limits<double>::quiet_NaN();
     EXPECT_TRUE(std::isnan(pj_phi2(ctx, nan, 0.0)));
     EXPECT_TRUE(std::isnan(pj_phi2(ctx, 0.0, nan)));
     EXPECT_TRUE(std::isnan(pj_phi2(ctx, nan, nan)));
 
     // We do not really care about the values that follow.
-    constexpr auto inf = std::numeric_limits<double>::infinity();
+    const auto inf = std::numeric_limits<double>::infinity();
 
     EXPECT_DOUBLE_EQ(-M_PI_2, pj_phi2(ctx, inf, 0.0));
     EXPECT_TRUE(std::isnan(pj_phi2(ctx, 0.0, inf)));

test/unit/proj_errno_string_test.cpp

@@ -43,13 +43,13 @@ TEST(ProjErrnoStringTest, ProjErrnos) {
     EXPECT_STREQ("invalid projection system error (-1000)", proj_errno_string(-1000));
     EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-9999));
     // for errnos < -9999, -9999 is always returned
-    constexpr int min = std::numeric_limits<int>::min();
+    const int min = std::numeric_limits<int>::min();
     EXPECT_STREQ("invalid projection system error (-9999)",proj_errno_string(min));
     EXPECT_STREQ("invalid projection system error (-9999)", proj_errno_string(-10000));
 }
 
 TEST(ProjErrnoStringTest, SystemErrnos) {
-    constexpr int max = std::numeric_limits<int>::max();
+    const int max = std::numeric_limits<int>::max();
 
 #ifdef HAVE_STRERROR
     EXPECT_STREQ(strerror(5), proj_errno_string(5));