Avoid static variables and functions in header files.

bangerth · barendgehrels · commit fd6d0e7efd11 · 2025-05-15T19:00:51.000+02:00
diff --git a/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp b/include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp
@@ -50,7 +50,7 @@ template
     typename RingCollection,
     typename Strategy
 >
-static inline bool within_selected_input(Item const& item2,
+inline bool within_selected_input(Item const& item2,
         InnerGeometry const& inner_geometry,
         ring_identifier const& outer_id,
         Geometry1 const& geometry1, Geometry2 const& geometry2,
@@ -86,7 +86,7 @@ template
     typename RingCollection,
     typename Strategy
 >
-static inline bool within_selected_input(Item const& item2,
+inline bool within_selected_input(Item const& item2,
         ring_identifier const& inner_id, ring_identifier const& outer_id,
         Geometry1 const& geometry1, Geometry2 const& geometry2,
         RingCollection const& collection,
diff --git a/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -60,7 +60,7 @@ namespace following { namespace linear
 // follower for linear/linear geometries set operations
 
 template <typename Turn, typename Operation>
-static inline bool is_entering(Turn const& turn,
+inline bool is_entering(Turn const& turn,
                                Operation const& operation)
 {
     if ( turn.method != method_touch && turn.method != method_touch_interior )
@@ -73,7 +73,7 @@ static inline bool is_entering(Turn const& turn,
 
 
 template <typename Turn, typename Operation>
-static inline bool is_staying_inside(Turn const& turn,
+inline bool is_staying_inside(Turn const& turn,
                                      Operation const& operation,
                                      bool entered)
 {
@@ -92,7 +92,7 @@ static inline bool is_staying_inside(Turn const& turn,
 
 
 template <typename Turn, typename Operation>
-static inline bool is_leaving(Turn const& turn,
+inline bool is_leaving(Turn const& turn,
                               Operation const& operation,
                               bool entered)
 {
@@ -125,7 +125,7 @@ static inline bool is_leaving(Turn const& turn,
 
 
 template <typename Turn, typename Operation>
-static inline bool is_isolated_point(Turn const& turn,
+inline bool is_isolated_point(Turn const& turn,
                                      Operation const& operation,
                                      bool entered)
 {
diff --git a/include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp b/include/boost/geometry/algorithms/detail/overlay/range_in_geometry.hpp
@@ -106,7 +106,7 @@ struct point_in_geometry_helper<Box, box_tag>
 // This function returns
 // when it finds a point of geometry1 inside or outside geometry2
 template <typename Geometry1, typename Geometry2, typename Strategy>
-static inline int range_in_geometry(Geometry1 const& geometry1,
+inline int range_in_geometry(Geometry1 const& geometry1,
                                     Geometry2 const& geometry2,
                                     Strategy const& strategy,
                                     bool skip_first = false)
diff --git a/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp b/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
@@ -358,7 +358,7 @@ inline bool turn_on_the_same_ip(Turn const& prev_turn, Turn const& curr_turn,
 }
 
 template <typename IntersectionPoint, typename OperationInfo, typename BoundaryChecker>
-static inline bool is_ip_on_boundary(IntersectionPoint const& ip,
+inline bool is_ip_on_boundary(IntersectionPoint const& ip,
                                      OperationInfo const& operation_info,
                                      BoundaryChecker const& boundary_checker)
 {
diff --git a/include/boost/geometry/core/access.hpp b/include/boost/geometry/core/access.hpp
@@ -33,10 +33,10 @@ namespace boost { namespace geometry
 {
 
 /// Index of minimum corner of the box.
-int const min_corner = 0;
+BOOST_INLINE_CONSTEXPR int min_corner = 0;
 
 /// Index of maximum corner of the box.
-int const max_corner = 1;
+BOOST_INLINE_CONSTEXPR int max_corner = 1;
 
 namespace traits
 {
diff --git a/include/boost/geometry/formulas/spherical.hpp b/include/boost/geometry/formulas/spherical.hpp
@@ -45,7 +45,7 @@ struct result_spherical
 };
 
 template <typename T>
-static inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z)
+inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z)
 {
     T const cos_lat = cos(lat);
     x = cos_lat * cos(lon);
@@ -54,7 +54,7 @@ static inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z
 }
 
 template <typename Point3d, typename PointSph>
-static inline Point3d sph_to_cart3d(PointSph const& point_sph)
+inline Point3d sph_to_cart3d(PointSph const& point_sph)
 {
     using calc_t = coordinate_type_t<Point3d>;
 
@@ -72,14 +72,14 @@ static inline Point3d sph_to_cart3d(PointSph const& point_sph)
 }
 
 template <typename T>
-static inline void cart3d_to_sph(T const& x, T const& y, T const& z, T & lon, T & lat)
+inline void cart3d_to_sph(T const& x, T const& y, T const& z, T & lon, T & lat)
 {
     lon = atan2(y, x);
     lat = asin(z);
 }
 
 template <typename PointSph, typename Point3d>
-static inline PointSph cart3d_to_sph(Point3d const& point_3d)
+inline PointSph cart3d_to_sph(Point3d const& point_3d)
 {
     using coord_t = coordinate_type_t<PointSph>;
     using calc_t = coordinate_type_t<Point3d>;
@@ -113,7 +113,7 @@ static inline PointSph cart3d_to_sph(Point3d const& point_3d)
 // 1 left
 // 0 on
 template <typename Point3d1, typename Point3d2>
-static inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)
+inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)
 {
     typedef typename select_coordinate_type<Point3d1, Point3d2>::type calc_t;
     calc_t c0 = 0;
@@ -124,7 +124,7 @@ static inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)
 }
 
 template <typename CT, bool ReverseAzimuth, typename T1, typename T2>
-static inline result_spherical<CT> spherical_azimuth(T1 const& lon1,
+inline result_spherical<CT> spherical_azimuth(T1 const& lon1,
                                                      T1 const& lat1,
                                                      T2 const& lon2,
                                                      T2 const& lat2)
diff --git a/include/boost/geometry/index/detail/utilities.hpp b/include/boost/geometry/index/detail/utilities.hpp
@@ -20,22 +20,22 @@
 namespace boost { namespace geometry { namespace index { namespace detail {
 
 template<class T>
-static inline void assign_cond(T & l, T const& r, std::true_type)
+inline void assign_cond(T & l, T const& r, std::true_type)
 {
     l = r;
 }
 
 template<class T>
-static inline void assign_cond(T &, T const&, std::false_type) {}
+inline void assign_cond(T &, T const&, std::false_type) {}
 
 template<class T>
-static inline void move_cond(T & l, T & r, std::true_type)
+inline void move_cond(T & l, T & r, std::true_type)
 {
     l = std::move(r);
 }
 
 template<class T>
-static inline void move_cond(T &, T &, std::false_type) {}
+inline void move_cond(T &, T &, std::false_type) {}
 
 template <typename T> inline
 void swap_cond(T & l, T & r, std::true_type)

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ inline bool turn_on_the_same_ip(Turn const& prev_turn, Turn const& curr_turn,`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`template <typename IntersectionPoint, typename OperationInfo, typename BoundaryChecker>`
`361`		`-static inline bool is_ip_on_boundary(IntersectionPoint const& ip,`
	`361`	`+inline bool is_ip_on_boundary(IntersectionPoint const& ip,`
`362`	`362`	`OperationInfo const& operation_info,`
`363`	`363`	`BoundaryChecker const& boundary_checker)`
`364`	`364`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ namespace boost { namespace geometry`
`33`	`33`	`{`
`34`	`34`
`35`	`35`	`/// Index of minimum corner of the box.`
`36`		`-int const min_corner = 0;`
	`36`	`+BOOST_INLINE_CONSTEXPR int min_corner = 0;`
`37`	`37`
`38`	`38`	`/// Index of maximum corner of the box.`
`39`		`-int const max_corner = 1;`
	`39`	`+BOOST_INLINE_CONSTEXPR int max_corner = 1;`
`40`	`40`
`41`	`41`	`namespace traits`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ struct result_spherical`
`45`	`45`	`};`
`46`	`46`
`47`	`47`	`template <typename T>`
`48`		`-static inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z)`
	`48`	`+inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z)`
`49`	`49`	`{`
`50`	`50`	`T const cos_lat = cos(lat);`
`51`	`51`	`x = cos_lat * cos(lon);`
`@@ -54,7 +54,7 @@ static inline void sph_to_cart3d(T const& lon, T const& lat, T & x, T & y, T & z`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`template <typename Point3d, typename PointSph>`
`57`		`-static inline Point3d sph_to_cart3d(PointSph const& point_sph)`
	`57`	`+inline Point3d sph_to_cart3d(PointSph const& point_sph)`
`58`	`58`	`{`
`59`	`59`	`using calc_t = coordinate_type_t<Point3d>;`
`60`	`60`
`@@ -72,14 +72,14 @@ static inline Point3d sph_to_cart3d(PointSph const& point_sph)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`template <typename T>`
`75`		`-static inline void cart3d_to_sph(T const& x, T const& y, T const& z, T & lon, T & lat)`
	`75`	`+inline void cart3d_to_sph(T const& x, T const& y, T const& z, T & lon, T & lat)`
`76`	`76`	`{`
`77`	`77`	`lon = atan2(y, x);`
`78`	`78`	`lat = asin(z);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`template <typename PointSph, typename Point3d>`
`82`		`-static inline PointSph cart3d_to_sph(Point3d const& point_3d)`
	`82`	`+inline PointSph cart3d_to_sph(Point3d const& point_3d)`
`83`	`83`	`{`
`84`	`84`	`using coord_t = coordinate_type_t<PointSph>;`
`85`	`85`	`using calc_t = coordinate_type_t<Point3d>;`
`@@ -113,7 +113,7 @@ static inline PointSph cart3d_to_sph(Point3d const& point_3d)`
`113`	`113`	`// 1 left`
`114`	`114`	`// 0 on`
`115`	`115`	`template <typename Point3d1, typename Point3d2>`
`116`		`-static inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)`
	`116`	`+inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)`
`117`	`117`	`{`
`118`	`118`	`typedef typename select_coordinate_type<Point3d1, Point3d2>::type calc_t;`
`119`	`119`	`calc_t c0 = 0;`
`@@ -124,7 +124,7 @@ static inline int sph_side_value(Point3d1 const& norm, Point3d2 const& pt)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`template <typename CT, bool ReverseAzimuth, typename T1, typename T2>`
`127`		`-static inline result_spherical<CT> spherical_azimuth(T1 const& lon1,`
	`127`	`+inline result_spherical<CT> spherical_azimuth(T1 const& lon1,`
`128`	`128`	`T1 const& lat1,`
`129`	`129`	`T2 const& lon2,`
`130`	`130`	`T2 const& lat2)`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,22 @@`
`20`	`20`	`namespace boost { namespace geometry { namespace index { namespace detail {`
`21`	`21`
`22`	`22`	`template<class T>`
`23`		`-static inline void assign_cond(T & l, T const& r, std::true_type)`
	`23`	`+inline void assign_cond(T & l, T const& r, std::true_type)`
`24`	`24`	`{`
`25`	`25`	`l = r;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`template<class T>`
`29`		`-static inline void assign_cond(T &, T const&, std::false_type) {}`
	`29`	`+inline void assign_cond(T &, T const&, std::false_type) {}`
`30`	`30`
`31`	`31`	`template<class T>`
`32`		`-static inline void move_cond(T & l, T & r, std::true_type)`
	`32`	`+inline void move_cond(T & l, T & r, std::true_type)`
`33`	`33`	`{`
`34`	`34`	`l = std::move(r);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`template<class T>`
`38`		`-static inline void move_cond(T &, T &, std::false_type) {}`
	`38`	`+inline void move_cond(T &, T &, std::false_type) {}`
`39`	`39`
`40`	`40`	`template <typename T> inline`
`41`	`41`	`void swap_cond(T & l, T & r, std::true_type)`