Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christopher Steward
VTK
Commits
596f85b4
Commit
596f85b4
authored
6 years ago
by
Ken Martin
Browse files
Options
Downloads
Patches
Plain Diff
suppress boost warning fix ospray one
two buildbot warnings
parent
acfdfe4a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMake/CTestCustom.cmake.in
+4
-1
4 additions, 1 deletion
CMake/CTestCustom.cmake.in
Rendering/OSPRay/vtkOSPRayMaterialLibrary.cxx
+17
-6
17 additions, 6 deletions
Rendering/OSPRay/vtkOSPRayMaterialLibrary.cxx
with
21 additions
and
7 deletions
CMake/CTestCustom.cmake.in
+
4
−
1
View file @
596f85b4
...
...
@@ -69,7 +69,10 @@ if (NOT cdash_show_third_party_warnings)
# and causes a match due to the work warning in it
"return 0; /\\* supresses a warning \\*/"
# boost graph lib causes a warning on gcc with code that
# boost uses internally. An example for you template fans is
# /source/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx:221:47: warning: '*((void*)(& ei)+32).__gnu_cxx::__normal_iterator<boost::detail::stored_edge_property<long unsigned int, boost::property<boost::edge_index_t, unsigned int> >*, std::vector<boost::detail::stored_edge_property<long unsigned int, boost::property<boost::edge_index_t, unsigned int> >, std::allocator<boost::detail::stored_edge_property<long unsigned int, boost::property<boost::edge_index_t, unsigned int> > > > >::_M_current' may be used uninitialized in this function [-Wmaybe-uninitialized]
"[Bb]oost[Gg]raph.*edge_property.*may be used uninitialized"
)
endif ()
...
...
This diff is collapsed.
Click to expand it.
Rendering/OSPRay/vtkOSPRayMaterialLibrary.cxx
+
17
−
6
View file @
596f85b4
...
...
@@ -527,13 +527,24 @@ const char * vtkOSPRayMaterialLibrary::WriteBuffer()
}
root
[
"materials"
]
=
materials
;
Json
::
FastWriter
fast
;
std
::
string
sFast
=
fast
.
write
(
root
);
char
*
buf
=
new
char
[
sFast
.
length
()
+
1
];
memcpy
(
buf
,
sFast
.
c_str
(),
sFast
.
length
());
buf
[
sFast
.
length
()]
=
0
;
return
buf
;
Json
::
StreamWriterBuilder
builder
;
builder
[
"commentStyle"
]
=
"None"
;
builder
[
"indentation"
]
=
" "
;
std
::
unique_ptr
<
Json
::
StreamWriter
>
writer
(
builder
.
newStreamWriter
());
std
::
ostringstream
result
;
writer
->
write
(
root
,
&
result
);
std
::
string
rstring
=
result
.
str
();
if
(
rstring
.
size
())
{
char
*
buf
=
new
char
[
rstring
.
size
()
+
1
];
memcpy
(
buf
,
rstring
.
c_str
(),
rstring
.
size
());
buf
[
rstring
.
size
()]
=
0
;
return
buf
;
}
return
nullptr
;
}
//-----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment