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
a99fcb4e
Commit
a99fcb4e
authored
Oct 17, 2017
by
Jamie Seward
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comments and newline
parent
917d9d8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
test/CMakeLists.txt
test/CMakeLists.txt
+4
-4
test/src/unit-readme.cpp
test/src/unit-readme.cpp
+1
-1
No files found.
test/CMakeLists.txt
View file @
a99fcb4e
...
@@ -75,10 +75,10 @@ if(MSVC)
...
@@ -75,10 +75,10 @@ if(MSVC)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/W4"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/W4"
)
endif
()
endif
()
# warning C4389: '==': signed/unsigned mismatch
#
Disable
warning C4389: '==': signed/unsigned mismatch
# warning C4309: 'static_cast': truncation of constant value
#
Disable
warning C4309: 'static_cast': truncation of constant value
# warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
#
Disable
warning C4566: character represented by universal-character-name '\uFF01' cannot be represented in the current code page (1252)
# warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::operator <<': was declared deprecated
#
Disable
warning C4996: 'nlohmann::basic_json<std::map,std::vector,std::string,bool,int64_t,uint64_t,double,std::allocator,nlohmann::adl_serializer>::operator <<': was declared deprecated
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/wd4389 /wd4309 /wd4566 /wd4996"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/wd4389 /wd4309 /wd4566 /wd4996"
)
endif
()
endif
()
...
...
test/src/unit-readme.cpp
View file @
a99fcb4e
...
@@ -306,4 +306,4 @@ TEST_CASE("README", "[hide]")
...
@@ -306,4 +306,4 @@ TEST_CASE("README", "[hide]")
#if defined(_MSC_VER)
#if defined(_MSC_VER)
#pragma warning (pop)
#pragma warning (pop)
#endif
#endif
\ No newline at end of file
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