Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
b9ed082e
Commit
b9ed082e
authored
Feb 18, 2019
by
Martin Heistermann
Browse files
Avoid deprecated implicit handle->int conversion in tests
parent
dc941e29
Pipeline
#8629
passed with stage
in 5 minutes and 54 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/Unittests/unittests_basics.cc
View file @
b9ed082e
...
...
@@ -796,7 +796,7 @@ TEST_F(PolyhedralMeshBase, DeleteFaceBUTest1) {
if
(
mesh_
.
face_handle
(
hfh
)
==
FaceHandle
(
0
))
continue
;
hfh
.
idx
((
hfh
.
idx
()
>
mesh_
.
halfface_handle
(
FaceHandle
(
0
),
1
)
?
hfh
.
idx
()
-
2
:
hfh
.
idx
()));
hfh
.
idx
((
hfh
.
idx
()
>
mesh_
.
halfface_handle
(
FaceHandle
(
0
),
1
)
.
idx
()
?
hfh
.
idx
()
-
2
:
hfh
.
idx
()));
ihfs
[
i
].
push_back
(
hfh
);
}
...
...
@@ -834,13 +834,13 @@ TEST_F(PolyhedralMeshBase, DeleteEdgeBUTest1) {
std
::
vector
<
HalfEdgeHandle
>
hes0
;
for
(
VertexOHalfEdgeIter
voh_it
=
mesh_
.
voh_iter
(
vh0
);
voh_it
.
valid
();
++
voh_it
)
{
if
(
mesh_
.
edge_handle
(
*
voh_it
)
==
EdgeHandle
(
0
))
continue
;
hes0
.
push_back
(
HalfEdgeHandle
(
voh_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
?
voh_it
->
idx
()
-
2
:
voh_it
->
idx
()));
hes0
.
push_back
(
HalfEdgeHandle
(
voh_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
.
idx
()
?
voh_it
->
idx
()
-
2
:
voh_it
->
idx
()));
}
std
::
vector
<
HalfEdgeHandle
>
hes1
;
for
(
VertexOHalfEdgeIter
voh_it
=
mesh_
.
voh_iter
(
vh1
);
voh_it
.
valid
();
++
voh_it
)
{
if
(
mesh_
.
edge_handle
(
*
voh_it
)
==
EdgeHandle
(
0
))
continue
;
hes1
.
push_back
(
HalfEdgeHandle
(
voh_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
?
voh_it
->
idx
()
-
2
:
voh_it
->
idx
()));
hes1
.
push_back
(
HalfEdgeHandle
(
voh_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
.
idx
()
?
voh_it
->
idx
()
-
2
:
voh_it
->
idx
()));
}
mesh_
.
delete_edge
(
EdgeHandle
(
0
));
...
...
@@ -913,7 +913,7 @@ TEST_F(PolyhedralMeshBase, DeleteFaceBUTest1noBU) {
if
(
mesh_
.
face_handle
(
hfh
)
==
FaceHandle
(
0
))
continue
;
hfh
.
idx
((
hfh
.
idx
()
>
mesh_
.
halfface_handle
(
FaceHandle
(
0
),
1
)
?
hfh
.
idx
()
-
2
:
hfh
.
idx
()));
hfh
.
idx
((
hfh
.
idx
()
>
mesh_
.
halfface_handle
(
FaceHandle
(
0
),
1
)
.
idx
()
?
hfh
.
idx
()
-
2
:
hfh
.
idx
()));
ihfs
[
i
].
push_back
(
hfh
);
}
...
...
@@ -968,7 +968,7 @@ TEST_F(PolyhedralMeshBase, DeleteEdgeBUTest1noBU) {
if
(
mesh_
.
halfedge
(
*
he_it
).
from_vertex
()
==
vh0
)
{
if
(
mesh_
.
edge_handle
(
*
he_it
)
==
EdgeHandle
(
0
))
continue
;
hes0
.
push_back
(
HalfEdgeHandle
(
he_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
?
he_it
->
idx
()
-
2
:
he_it
->
idx
()));
hes0
.
push_back
(
HalfEdgeHandle
(
he_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
.
idx
()
?
he_it
->
idx
()
-
2
:
he_it
->
idx
()));
}
}
...
...
@@ -978,7 +978,7 @@ TEST_F(PolyhedralMeshBase, DeleteEdgeBUTest1noBU) {
if
(
mesh_
.
halfedge
(
*
he_it
).
from_vertex
()
==
vh1
)
{
if
(
mesh_
.
edge_handle
(
*
he_it
)
==
EdgeHandle
(
0
))
continue
;
hes1
.
push_back
(
HalfEdgeHandle
(
he_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
?
he_it
->
idx
()
-
2
:
he_it
->
idx
()));
hes1
.
push_back
(
HalfEdgeHandle
(
he_it
->
idx
()
>
mesh_
.
halfedge_handle
(
EdgeHandle
(
0
),
1
)
.
idx
()
?
he_it
->
idx
()
-
2
:
he_it
->
idx
()));
}
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment