Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Commit

Permalink
Run appveyor tests again, even if they are currently broken
Browse files Browse the repository at this point in the history
  • Loading branch information
d-frey committed Mar 27, 2017
1 parent 02cce8d commit 5b041cc
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ enable_testing ()

include_directories (${CMAKE_SOURCE_DIR}/include)

file (GLOB testsources src/test/json/*.cc)
file (GLOB testsources src/test/json/*.cpp)
foreach (testsourcefile ${testsources})
get_filename_component (exename ${testsourcefile} NAME_WE)
add_executable (${exename} ${testsourcefile})
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.double-conversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
The header include/tao/json/external/double.hh contains
The header include/tao/json/external/double.hpp contains
modified portions of the double-conversion library from
https://www.github.com/google/double-conversion
which is licensed as follows:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ The Art of C++ / JSON is a zero-dependency C++11 header-only library that provid
* Stream SAX to (prettified) JSON string representation.
* SAX-to-DOM value construction.
* DOM-to-SAX value traversal.
* Supports conversion from and to *foreign* DOM objects (check [`contrib/nlohmann.cc`](contrib/nlohmann.cc)).
* Supports conversion from and to *foreign* DOM objects (check [`contrib/nlohmann.cpp`](contrib/nlohmann.cpp)).
* SAX comparator (against an existing DOM value).
* SAX hash algorithm (SHA-256 based).
* SAX schema validator.
Expand All @@ -60,10 +60,10 @@ The documentation will be finished once the functionality and interfaces are fin
Until then, here are a few short indications on how to use this library:

* Requires Clang or GCC with `-std=c++11` (or other compiler with sufficient C++11 support).
* The library is header-only, to install and use simply copy the directory [`include/tao`](include/tao) to a convenient place and include the file [`include/tao/json.hh`](include/tao/json.hh).
* The generic JSON value class, the main part of this library, is in [`include/tao/json/value.hh`](include/tao/json/value.hh).
* To parse a JSON string representation to a DOM value, use one of the functions in [`include/tao/json/from_string.hh`](include/tao/json/from_string.hh) or [`include/tao/json/parse_file.hh`](include/tao/json/parse_file.hh).
* To produce a JSON string representation from a DOM value, use one of the appropriate functions in [`include/tao/json/to_string.hh`](include/tao/json/to_string.hh) or [`include/tao/json/stream.hh`](include/tao/json/stream.hh).
* The library is header-only, to install and use simply copy the directory [`include/tao`](include/tao) to a convenient place and include the file [`include/tao/json.hpp`](include/tao/json.hpp).
* The generic JSON value class, the main part of this library, is in [`include/tao/json/value.hpp`](include/tao/json/value.hpp).
* To parse a JSON string representation to a DOM value, use one of the functions in [`include/tao/json/from_string.hpp`](include/tao/json/from_string.hpp) or [`include/tao/json/parse_file.hpp`](include/tao/json/parse_file.hpp).
* To produce a JSON string representation from a DOM value, use one of the appropriate functions in [`include/tao/json/to_string.hpp`](include/tao/json/to_string.hpp) or [`include/tao/json/stream.hpp`](include/tao/json/stream.hpp).

## License

Expand Down
2 changes: 1 addition & 1 deletion doc/ref/basic_value.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### `tao::json::basic_value`

Defined in `<tao/json/value.hh>`
Defined in `<tao/json/value.hpp>`

```c++
template<
Expand Down
2 changes: 1 addition & 1 deletion doc/ref/type.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## `tao::json::type`

Defined in `<tao/json/type.hh>`
Defined in `<tao/json/type.hpp>`

```c++
enum class type : std::uint8_t
Expand Down
2 changes: 1 addition & 1 deletion src/test/json/parse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ namespace tao
test_array();
test_object();

// TODO: Other integer tests missing from integer.cc?
// TODO: Other integer tests missing from integer.cpp?

TEST_THROWS( from_string( "1" + std::string( internal::max_mantissa_digits, '0' ) ) ); // Throws due to overflow.
TEST_THROWS( from_string( "2" + std::string( internal::max_mantissa_digits, '1' ) ) ); // Throws due to overflow.
Expand Down

0 comments on commit 5b041cc

Please sign in to comment.