CTransitionDatabaseGame: Conditionally disable swap inlining

Author: Antidote

configure.py

@@ -634,7 +634,7 @@ def EquivalentFor(*versions):
                 "MetroidPrime/CTransitionDatabaseGame.cpp",
                 extra_cflags=['-pragma "inline_max_size(126)"']
                 if version_num >= VERSIONS.index("GM8P01_00")
-                else [],
+                else ["-inline", "level=6"],
             ),
             Object(
                 MatchingFor("GM8E01_00", "GM8E01_01", "GM8P01_00"),

extern/rstl/include/rstl/algorithm.hpp

@@ -18,14 +18,20 @@ int count(It first, It last, const T& val) {
 }
 
 template < class It, class T >
-inline It find(It first, It last, const T& val) {
+#ifndef RSTL_DONT_INLINE_ALGORITHM
+inline
+#endif
+It find(It first, It last, const T& val) {
   while (first != last && !(*first == val))
     ++first;
   return first;
 }
 
 template < typename T >
-inline void swap(T& a, T& b) {
+#ifndef RSTL_DONT_INLINE_ALGORITHM
+inline
+#endif
+    void swap(T& a, T& b) {
   T tmp(a);
   a = b;
   b = tmp;
@@ -365,9 +371,11 @@ find_by_key(const T& container,
 template < typename T >
 typename T::const_iterator inline find_by_key(
     const T& container, const typename select1st< typename T::value_type >::value_type& key) {
-  return binary_find(container.begin(), container.end(), key,
-    pair_sorter_finder< typename T::value_type, less< typename select1st< typename T::value_type >::value_type > >(
-      less< typename select1st< typename T::value_type >::value_type >()));
+  return binary_find(
+      container.begin(), container.end(), key,
+      pair_sorter_finder< typename T::value_type,
+                          less< typename select1st< typename T::value_type >::value_type > >(
+          less< typename select1st< typename T::value_type >::value_type >()));
 }
 
 template < typename T, class Cmp >
@@ -385,9 +393,11 @@ find_by_key_nc(T& container, const typename select1st< typename T::value_type >:
 template < typename T >
 typename T::iterator inline find_by_key_nc(
     T& container, const typename select1st< typename T::value_type >::value_type& key) {
-  return binary_find(container.begin(), container.end(), key,
-    pair_sorter_finder< typename T::value_type, less< typename select1st< typename T::value_type >::value_type > >(
-      less< typename select1st< typename T::value_type >::value_type >()));
+  return binary_find(
+      container.begin(), container.end(), key,
+      pair_sorter_finder< typename T::value_type,
+                          less< typename select1st< typename T::value_type >::value_type > >(
+          less< typename select1st< typename T::value_type >::value_type >()));
 }
 
 template < typename T >

src/MetroidPrime/CTransitionDatabaseGame.cpp

@@ -3,6 +3,7 @@
 #include "Kyoto/Animation/CHalfTransition.hpp"
 #include "Kyoto/Animation/CTransition.hpp"
 
+#define RSTL_DONT_INLINE_ALGORITHM
 #include "rstl/algorithm.hpp"
 
 namespace {