[pdal-commits] [PDAL/PDAL] 051f10: Replace jsoncpp with nlohmann/json (#2470)

Andrew Bell noreply at github.com
Tue Apr 23 07:01:33 PDT 2019


  Branch: refs/heads/master
  Home:   https://github.com/PDAL/PDAL
  Commit: 051f10e6755b1a2aefe895d3c8d7cad9fa52a9d0
      https://github.com/PDAL/PDAL/commit/051f10e6755b1a2aefe895d3c8d7cad9fa52a9d0
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2019-04-23 (Tue, 23 Apr 2019)

  Changed paths:
    M CMakeLists.txt
    M apps/CMakeLists.txt
    M apps/pdal.cpp
    M cmake/arbiter.cmake
    R cmake/json.cmake
    R cmake/modules/FindJSONCPP.cmake
    A cmake/nlohmann.cmake
    M dimbuilder/CMakeLists.txt
    M dimbuilder/DimBuilder.cpp
    M dimbuilder/DimBuilder.hpp
    M doc/development/compilation/unix.rst
    M doc/quickstart.rst
    M filters/InfoFilter.cpp
    M filters/MongoExpressionFilter.hpp
    M filters/StatsFilter.cpp
    M filters/private/mongoexpression/Comparison.cpp
    M filters/private/mongoexpression/Comparison.hpp
    M filters/private/mongoexpression/Expression.cpp
    M filters/private/mongoexpression/Expression.hpp
    M filters/private/mongoexpression/Support.hpp
    M io/EptAddonWriter.cpp
    M io/EptAddonWriter.hpp
    M io/EptReader.cpp
    M io/EptReader.hpp
    M io/LasWriter.cpp
    M io/LasWriter.hpp
    M io/private/EptSupport.hpp
    M kernels/PipelineKernel.cpp
    M kernels/TranslateKernel.cpp
    M pdal/Options.cpp
    M pdal/PDALUtils.cpp
    M pdal/PipelineReaderJSON.cpp
    M pdal/PipelineReaderJSON.hpp
    M pdal/StageExtensions.cpp
    M plugins/greyhound/CMakeLists.txt
    M plugins/greyhound/io/GreyhoundCommon.cpp
    M plugins/greyhound/io/GreyhoundCommon.hpp
    M plugins/greyhound/io/GreyhoundReader.cpp
    M plugins/greyhound/io/GreyhoundReader.hpp
    M plugins/greyhound/io/GreyhoundWriter.cpp
    M plugins/greyhound/io/GreyhoundWriter.hpp
    M plugins/greyhound/io/bounds.cpp
    M plugins/greyhound/io/bounds.hpp
    M plugins/greyhound/io/point.hpp
    M plugins/greyhound/test/GreyhoundReaderTest.cpp
    M plugins/i3s/CMakeLists.txt
    M plugins/i3s/io/EsriReader.cpp
    M plugins/i3s/io/EsriReader.hpp
    M plugins/i3s/io/EsriUtil.hpp
    M plugins/i3s/io/I3SReader.cpp
    M plugins/i3s/io/I3SReader.hpp
    M plugins/i3s/io/SlpkReader.cpp
    M plugins/i3s/io/SlpkReader.hpp
    M plugins/matlab/CMakeLists.txt
    M plugins/nitf/CMakeLists.txt
    M plugins/pcl/CMakeLists.txt
    M plugins/pcl/pipeline/PCLPipeline.h
    M plugins/pcl/pipeline/PCLPipeline.hpp
    M plugins/python/filters/CMakeLists.txt
    M plugins/python/filters/PythonFilter.hpp
    M plugins/rdb/CMakeLists.txt
    M plugins/rdb/io/RdbPointcloud.cpp
    M plugins/rdb/io/RdbReader.cpp
    M scripts/appveyor/conda/recipe/meta.yaml
    M scripts/conda/osx-setup.sh
    M scripts/docker/Dockerfile
    M scripts/docker/centos/Dockerfile
    M scripts/docker/ubuntu/Dockerfile
    M scripts/docker/ubuntu/dependencies/Dockerfile
    M scripts/linux-install-scripts/packages.sh
    M scripts/linux-install-scripts/pdal.sh
    M test/unit/CMakeLists.txt
    M test/unit/OptionsTest.cpp
    M test/unit/ProgramArgsTest.cpp
    M test/unit/apps/pcpipelineTestJSON.cpp
    M test/unit/filters/MongoExpressionFilterTest.cpp
    M test/unit/io/EptAddonWriterTest.cpp
    M vendor/arbiter/CMakeLists.txt
    M vendor/arbiter/arbiter.cpp
    M vendor/arbiter/arbiter.hpp
    R vendor/jsoncpp/dist/CMakeLists.txt
    R vendor/jsoncpp/dist/json/forwards.h
    R vendor/jsoncpp/dist/json/json.h
    R vendor/jsoncpp/dist/jsoncpp.cpp
    A vendor/nlohmann/nlohmann/json.hpp

  Log Message:
  -----------
  Replace jsoncpp with nlohmann/json (#2470)

* First changes for nlohmann json.

* Link mongo with jsoncpp

* Update arbiter bundle, which removes some nested namespaces, fixes a potential file naming collision, and updates the JSON library used internally.

* Arbiter API update.

* First bunch of jsoncpp to nlohmann changes.

* Add missed file.

* JSONCPP to nlohmann

* Update Ept code.

* More JSONCPP -> nlohmann

* More jsoncpp -> nlohmann

* Remove remaining jsoncpp.

* Re-add find for sqlite.

* Remove script/doc jsoncpp remnants.

* Remove commented-out code.

* Undef snprintf for windows.

* Replace get() with dump().

* Update based on review.




More information about the pdal-commits mailing list