diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-01-21 21:27:14 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-01-21 21:27:14 +0100 |
| commit | bc31bda210a35e4c584b31e75dad259caed551fb (patch) | |
| tree | 9ea8f0ca5156c41aae7f53113a55b209d1ba3ac4 | |
| parent | c4191f3057ef89fb00df31cca23a6093f8f399cb (diff) | |
| download | PROJ-bc31bda210a35e4c584b31e75dad259caed551fb.tar.gz PROJ-bc31bda210a35e4c584b31e75dad259caed551fb.zip | |
scripts/reformat_cpp.sh: update to take into account sqlite3.hpp/cpp renaming to sqlite3_utils.hpp/cpp
| -rwxr-xr-x | scripts/reformat_cpp.sh | 2 | ||||
| -rw-r--r-- | test/unit/proj_context_test.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/reformat_cpp.sh b/scripts/reformat_cpp.sh index 1b54fb3b..20c32b29 100755 --- a/scripts/reformat_cpp.sh +++ b/scripts/reformat_cpp.sh @@ -19,7 +19,7 @@ for i in "$TOPDIR"/include/proj/*.hpp "$TOPDIR"/include/proj/internal/*.hpp \ "$TOPDIR"/src/iso19111/*.cpp "$TOPDIR"/test/unit/*.cpp "$TOPDIR"/src/apps/projinfo.cpp \ "$TOPDIR"/src/tracing.cpp "$TOPDIR"/src/grids.hpp "$TOPDIR"/src/grids.cpp \ "$TOPDIR"/src/filemanager.hpp "$TOPDIR"/src/filemanager.cpp \ - "$TOPDIR"/src/sqlite3.hpp "$TOPDIR"/src/sqlite3.cpp ; do + "$TOPDIR"/src/sqlite3_utils.hpp "$TOPDIR"/src/sqlite3_utils.cpp ; do if ! echo "$i" | grep -q "lru_cache.hpp"; then "$SCRIPT_DIR"/reformat.sh "$i"; fi diff --git a/test/unit/proj_context_test.cpp b/test/unit/proj_context_test.cpp index 30d6d781..92f251cd 100644 --- a/test/unit/proj_context_test.cpp +++ b/test/unit/proj_context_test.cpp @@ -170,7 +170,8 @@ TEST(proj_context, read_grid_from_user_writable_directory) { putenv(const_cast<char *>("PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=")); auto P = proj_create(ctx, "+init=temp_proj_dic3:MY_PIPELINE"); EXPECT_NE(P, nullptr); - putenv(const_cast<char *>("PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES")); + putenv( + const_cast<char *>("PROJ_SKIP_READ_USER_WRITABLE_DIRECTORY=YES")); proj_destroy(P); } proj_context_destroy(ctx); |