Skip to content

Commit e0e73f4

Browse files
committed
Merge branch 'v15' into fix_v15/rename_global_epsilon_to_GLOBAL_EPSILON
2 parents 3a42365 + 48a7088 commit e0e73f4

33 files changed

+94
-93
lines changed

include/geode/inspector/criterion/private/colocation_impl.h renamed to include/geode/inspector/criterion/internal/colocation_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
namespace geode
3232
{
33-
namespace detail
33+
namespace internal
3434
{
3535
/*!
3636
* Implementation of the inspection of the colocation of a Mesh
@@ -50,5 +50,5 @@ namespace geode
5050
private:
5151
const Mesh& mesh_;
5252
};
53-
} // namespace detail
53+
} // namespace internal
5454
} // namespace geode

include/geode/inspector/criterion/private/degeneration_impl.h renamed to include/geode/inspector/criterion/internal/degeneration_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
namespace geode
3030
{
31-
namespace detail
31+
namespace internal
3232
{
3333
/*!
3434
* Implementation of the inspection of the degeneration of a Mesh
@@ -54,5 +54,5 @@ namespace geode
5454
private:
5555
const Mesh& mesh_;
5656
};
57-
} // namespace detail
57+
} // namespace internal
5858
} // namespace geode

include/geode/inspector/topology/private/topology_helpers.h renamed to include/geode/inspector/topology/internal/topology_helpers.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace geode
4343

4444
namespace geode
4545
{
46-
namespace detail
46+
namespace internal
4747
{
4848
bool brep_blocks_are_meshed( const BRep& brep );
4949

@@ -77,5 +77,5 @@ namespace geode
7777
const Section& section,
7878
const ComponentID& component_id,
7979
const VertexSet& component_mesh );
80-
} // namespace detail
80+
} // namespace internal
8181
} // namespace geode

src/geode/inspector/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ add_geode_library(
2727
"criterion/section_meshes_inspector.cpp"
2828
"criterion/adjacency/surface_adjacency.cpp"
2929
"criterion/adjacency/solid_adjacency.cpp"
30-
"criterion/private/component_meshes_adjacency.cpp"
30+
"criterion/internal/component_meshes_adjacency.cpp"
3131
"criterion/adjacency/section_meshes_adjacency.cpp"
3232
"criterion/adjacency/brep_meshes_adjacency.cpp"
33-
"criterion/private/colocation_impl.cpp"
33+
"criterion/internal/colocation_impl.cpp"
3434
"criterion/colocation/pointset_colocation.cpp"
3535
"criterion/colocation/edgedcurve_colocation.cpp"
3636
"criterion/colocation/surface_colocation.cpp"
3737
"criterion/colocation/solid_colocation.cpp"
3838
"criterion/colocation/unique_vertices_colocation.cpp"
3939
"criterion/colocation/component_meshes_colocation.cpp"
40-
"criterion/private/degeneration_impl.cpp"
41-
"criterion/private/component_meshes_degeneration.cpp"
40+
"criterion/internal/degeneration_impl.cpp"
41+
"criterion/internal/component_meshes_degeneration.cpp"
4242
"criterion/degeneration/edgedcurve_degeneration.cpp"
4343
"criterion/degeneration/surface_degeneration.cpp"
4444
"criterion/degeneration/solid_degeneration.cpp"
@@ -52,7 +52,7 @@ add_geode_library(
5252
"criterion/manifold/solid_vertex_manifold.cpp"
5353
"criterion/manifold/solid_edge_manifold.cpp"
5454
"criterion/manifold/solid_facet_manifold.cpp"
55-
"criterion/private/component_meshes_manifold.cpp"
55+
"criterion/internal/component_meshes_manifold.cpp"
5656
"criterion/manifold/section_meshes_manifold.cpp"
5757
"criterion/manifold/brep_meshes_manifold.cpp"
5858
"topology/brep_topology.cpp"
@@ -64,7 +64,7 @@ add_geode_library(
6464
"topology/section_corners_topology.cpp"
6565
"topology/section_lines_topology.cpp"
6666
"topology/section_surfaces_topology.cpp"
67-
"topology/private/topology_helpers.cpp"
67+
"topology/internal/topology_helpers.cpp"
6868
"section_inspector.cpp"
6969
"brep_inspector.cpp"
7070
"pointset_inspector.cpp"
@@ -110,20 +110,20 @@ add_geode_library(
110110
"edgedcurve_inspector.h"
111111
"surface_inspector.h"
112112
"solid_inspector.h"
113-
PRIVATE_HEADERS
114-
"criterion/private/colocation_impl.h"
115-
"criterion/private/component_meshes_adjacency.h"
116-
"criterion/private/component_meshes_degeneration.h"
117-
"criterion/private/component_meshes_manifold.h"
118-
"criterion/private/degeneration_impl.h"
113+
INTERNAL_HEADERS
114+
"criterion/internal/colocation_impl.h"
115+
"criterion/internal/component_meshes_adjacency.h"
116+
"criterion/internal/component_meshes_degeneration.h"
117+
"criterion/internal/component_meshes_manifold.h"
118+
"criterion/internal/degeneration_impl.h"
119119
"topology/brep_corners_topology.h"
120120
"topology/brep_lines_topology.h"
121121
"topology/brep_surfaces_topology.h"
122122
"topology/brep_blocks_topology.h"
123123
"topology/section_corners_topology.h"
124124
"topology/section_lines_topology.h"
125125
"topology/section_surfaces_topology.h"
126-
"topology/private/topology_helpers.h"
126+
"topology/internal/topology_helpers.h"
127127
PUBLIC_DEPENDENCIES
128128
OpenGeode::basic
129129
PRIVATE_DEPENDENCIES

src/geode/inspector/criterion/adjacency/brep_meshes_adjacency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <geode/model/representation/core/brep.h>
3131

3232
#include <geode/inspector/criterion/adjacency/solid_adjacency.h>
33-
#include <geode/inspector/criterion/private/component_meshes_adjacency.h>
33+
#include <geode/inspector/criterion/internal/component_meshes_adjacency.h>
3434

3535
namespace geode
3636
{

src/geode/inspector/criterion/adjacency/section_meshes_adjacency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include <geode/model/representation/core/section.h>
3030

31-
#include <geode/inspector/criterion/private/component_meshes_adjacency.h>
31+
#include <geode/inspector/criterion/internal/component_meshes_adjacency.h>
3232

3333
namespace geode
3434
{

src/geode/inspector/criterion/colocation/edgedcurve_colocation.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
#include <geode/inspector/criterion/colocation/edgedcurve_colocation.h>
25-
#include <geode/inspector/criterion/private/colocation_impl.h>
25+
#include <geode/inspector/criterion/internal/colocation_impl.h>
2626

2727
#include <geode/basic/logger.h>
2828
#include <geode/basic/pimpl_impl.h>
@@ -33,11 +33,11 @@ namespace geode
3333
{
3434
template < index_t dimension >
3535
class EdgedCurveColocation< dimension >::Impl
36-
: public detail::ColocationImpl< dimension, EdgedCurve< dimension > >
36+
: public internal::ColocationImpl< dimension, EdgedCurve< dimension > >
3737
{
3838
public:
3939
Impl( const EdgedCurve< dimension >& mesh )
40-
: detail::ColocationImpl< dimension, EdgedCurve< dimension > >(
40+
: internal::ColocationImpl< dimension, EdgedCurve< dimension > >(
4141
mesh )
4242
{
4343
}

0 commit comments

Comments
 (0)