Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
d2e6e1bf
Unverified
Commit
d2e6e1bf
authored
Nov 02, 2018
by
Niels Lohmann
Committed by
GitHub
Nov 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1329 from ax3l/fix-typosWhitespaces
Fix EOL Whitespaces & CMake Spelling
parents
2f73a4d1
a7567bc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
CMakeLists.txt
CMakeLists.txt
+3
-3
README.md
README.md
+1
-1
nlohmann_json.natvis
nlohmann_json.natvis
+3
-3
No files found.
CMakeLists.txt
View file @
d2e6e1bf
...
@@ -60,10 +60,10 @@ if (MSVC)
...
@@ -60,10 +60,10 @@ if (MSVC)
set
(
NLOHMANN_ADD_NATVIS TRUE
)
set
(
NLOHMANN_ADD_NATVIS TRUE
)
set
(
NLOHMANN_NATVIS_FILE
"nlohmann_json.natvis"
)
set
(
NLOHMANN_NATVIS_FILE
"nlohmann_json.natvis"
)
target_sources
(
target_sources
(
${
NLOHMANN_JSON_TARGET_NAME
}
${
NLOHMANN_JSON_TARGET_NAME
}
INTERFACE
INTERFACE
$<INSTALL_INTERFACE:
${
NLOHMANN_NATVIS_FILE
}
>
$<INSTALL_INTERFACE:
${
NLOHMANN_NATVIS_FILE
}
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_NATVIS_FILE
}
>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NLOHMANN_NATVIS_FILE
}
>
)
)
endif
()
endif
()
...
...
README.md
View file @
d2e6e1bf
...
@@ -1214,7 +1214,7 @@ The library itself consists of a single header file licensed under the MIT licen
...
@@ -1214,7 +1214,7 @@ The library itself consists of a single header file licensed under the MIT licen
-
[
**Artistic Style**
](
http://astyle.sourceforge.net
)
for automatic source code identation
-
[
**Artistic Style**
](
http://astyle.sourceforge.net
)
for automatic source code identation
-
[
**Catch**
](
https://github.com/philsquared/Catch
)
for the unit tests
-
[
**Catch**
](
https://github.com/philsquared/Catch
)
for the unit tests
-
[
**Clang**
](
http://clang.llvm.org
)
for compilation with code sanitizers
-
[
**Clang**
](
http://clang.llvm.org
)
for compilation with code sanitizers
-
[
**C
m
ake**
](
https://cmake.org
)
for build automation
-
[
**C
M
ake**
](
https://cmake.org
)
for build automation
-
[
**Codacity**
](
https://www.codacy.com
)
for further
[
code analysis
](
https://www.codacy.com/app/nlohmann/json
)
-
[
**Codacity**
](
https://www.codacy.com
)
for further
[
code analysis
](
https://www.codacy.com/app/nlohmann/json
)
-
[
**Coveralls**
](
https://coveralls.io
)
to measure
[
code coverage
](
https://coveralls.io/github/nlohmann/json
)
-
[
**Coveralls**
](
https://coveralls.io
)
to measure
[
code coverage
](
https://coveralls.io/github/nlohmann/json
)
-
[
**Coverity Scan**
](
https://scan.coverity.com
)
for
[
static analysis
](
https://scan.coverity.com/projects/nlohmann-json
)
-
[
**Coverity Scan**
](
https://scan.coverity.com
)
for
[
static analysis
](
https://scan.coverity.com/projects/nlohmann-json
)
...
...
nlohmann_json.natvis
View file @
d2e6e1bf
...
@@ -19,8 +19,8 @@
...
@@ -19,8 +19,8 @@
</ExpandedItem>
</ExpandedItem>
</Expand>
</Expand>
</Type>
</Type>
<!-- skip the pair first/second members in the treeview while traversing a map.
<!-- skip the pair first/second members in the treeview while traversing a map.
Only works in VS 2015 Update 2 and beyond using the new visualization -->
Only works in VS 2015 Update 2 and beyond using the new visualization -->
<Type
Name=
"std::pair<*, nlohmann::basic_json<*>>"
IncludeView=
"MapHelper"
>
<Type
Name=
"std::pair<*, nlohmann::basic_json<*>>"
IncludeView=
"MapHelper"
>
<DisplayString>
{second}
</DisplayString>
<DisplayString>
{second}
</DisplayString>
...
@@ -28,5 +28,5 @@
...
@@ -28,5 +28,5 @@
<ExpandedItem>
second
</ExpandedItem>
<ExpandedItem>
second
</ExpandedItem>
</Expand>
</Expand>
</Type>
</Type>
</AutoVisualizer>
</AutoVisualizer>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment