Skip to content

Commit e9c9590

Browse files
committed
Apply prepare changes
1 parent 968cf4d commit e9c9590

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

include/geode/mesh/core/internal/grid_impl.hpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,16 @@ namespace geode
188188
{
189189
for( const auto v : Range{ nv } )
190190
{
191-
tasks[task_id++] = async::spawn(
192-
[&builder, &origin, v, w, du, dv, dw, nu, nv] {
193-
for( const auto u : Range{ nu } )
194-
{
195-
const auto vertex = u + v * nu + w * nu * nv;
196-
const Point3D translation{ { u * du, v * dv,
197-
w * dw } };
198-
builder.set_point(
199-
vertex, origin + translation );
200-
}
201-
} );
191+
tasks[task_id++] = async::spawn( [&builder, &origin, v, w,
192+
du, dv, dw, nu, nv] {
193+
for( const auto u : Range{ nu } )
194+
{
195+
const auto vertex = u + v * nu + w * nu * nv;
196+
const Point3D translation{ { u * du, v * dv,
197+
w * dw } };
198+
builder.set_point( vertex, origin + translation );
199+
}
200+
} );
202201
}
203202
}
204203
for( auto& task : async::when_all( tasks ).get() )

src/geode/geometry/bounding_box.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,6 @@ namespace geode
512512
template class opengeode_geometry_api BoundingBox< 2 >;
513513
template class opengeode_geometry_api BoundingBox< 3 >;
514514

515-
// template opengeode_geometry_api bool BoundingBox< 2 >::intersects< 2 >(
516-
// const Triangle< 2 >& ) const;
517-
// template opengeode_geometry_api bool BoundingBox< 3 >::intersects< 3 >(
518-
// const Triangle< 3 >& ) const;
519515
template opengeode_geometry_api bool BoundingBox< 3 >::intersects< 3 >(
520516
const Tetrahedron& ) const;
521517
} // namespace geode

src/geode/model/mixin/core/relationships.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,8 @@ namespace geode
994994
{
995995
}
996996

997-
Relationships::CollectionRangeIterator::
998-
~CollectionRangeIterator() = default;
997+
Relationships::CollectionRangeIterator::~CollectionRangeIterator() =
998+
default;
999999

10001000
bool Relationships::CollectionRangeIterator::operator!=(
10011001
const CollectionRangeIterator& /*unused*/ ) const

0 commit comments

Comments
 (0)