Merge pull request #101 from neogeek/hotfix/inline-methods

neogeek · web-flow · commit b901a5048b9d · 2025-02-23T00:00:47.000-05:00
[hotfix] Set methods to inline to prevent duplicate symbols.
diff --git a/RhythmGameUtilities/Scripts/Common.cs b/RhythmGameUtilities/Scripts/Common.cs
@@ -7,10 +7,10 @@ public static class CommonInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Lerp(float a, float b, float t);
+        public static extern float LerpInternal(float a, float b, float t);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float InverseLerp(float a, float b, float v);
+        public static extern float InverseLerpInternal(float a, float b, float v);
 
     }
 
@@ -25,7 +25,7 @@ public static class Common
         /// <param name="t">The value used for interpolation.</param>
         public static float Lerp(float a, float b, float t)
         {
-            return CommonInternal.Lerp(a, b, t);
+            return CommonInternal.LerpInternal(a, b, t);
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
         /// <param name="v">The value in the middle.</param>
         public static float InverseLerp(float a, float b, float v)
         {
-            return CommonInternal.InverseLerp(a, b, v);
+            return CommonInternal.InverseLerpInternal(a, b, v);
         }
 
     }
diff --git a/RhythmGameUtilities/Scripts/Utilities.cs b/RhythmGameUtilities/Scripts/Utilities.cs
@@ -8,20 +8,20 @@ internal static class UtilitiesInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float ConvertTickToPosition(int tick, int resolution);
+        public static extern float ConvertTickToPositionInternal(int tick, int resolution);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, Tempo[] tempoChanges,
             int tempoChangesSize, TimeSignature[] timeSignatures, int timeSignaturesSize);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta);
+        public static extern bool IsOnTheBeatInternal(int bpm, float currentTime, float delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier);
+        public static extern int RoundUpToTheNearestMultiplierInternal(int value, int multiplier);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta);
+        public static extern float CalculateAccuracyRatioInternal(int position, int currentPosition, int delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr CalculateBeatBarsInternal(Tempo[] tempoChanges, int tempoChangesSize, int resolution,
@@ -42,7 +42,7 @@ public static class Utilities
         /// <param name="resolution">The resolution of the song.</param>
         public static float ConvertTickToPosition(int tick, int resolution)
         {
-            return UtilitiesInternal.ConvertTickToPosition(tick, resolution);
+            return UtilitiesInternal.ConvertTickToPositionInternal(tick, resolution);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ public static int ConvertSecondsToTicks(float seconds, int resolution, Tempo[] t
         /// <param name="delta">The plus/minus delta to test the current time against.</param>
         public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         {
-            return UtilitiesInternal.IsOnTheBeat(bpm, currentTime, delta);
+            return UtilitiesInternal.IsOnTheBeatInternal(bpm, currentTime, delta);
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         /// <param name="multiplier">The multiplier to round using.</param>
         public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
         {
-            return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
+            return UtilitiesInternal.RoundUpToTheNearestMultiplierInternal(value, multiplier);
         }
 
         public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution = 192, int ts = 4,
@@ -140,7 +140,7 @@ public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution =
         /// <param name="delta">The plus/minus delta to test the current position against.</param>
         public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50)
         {
-            return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta);
+            return UtilitiesInternal.CalculateAccuracyRatioInternal(position, currentPosition, delta);
         }
 
     }
diff --git a/UnityPackage/Scripts/Common.cs b/UnityPackage/Scripts/Common.cs
@@ -7,10 +7,10 @@ public static class CommonInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float Lerp(float a, float b, float t);
+        public static extern float LerpInternal(float a, float b, float t);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float InverseLerp(float a, float b, float v);
+        public static extern float InverseLerpInternal(float a, float b, float v);
 
     }
 
@@ -25,7 +25,7 @@ public static class Common
         /// <param name="t">The value used for interpolation.</param>
         public static float Lerp(float a, float b, float t)
         {
-            return CommonInternal.Lerp(a, b, t);
+            return CommonInternal.LerpInternal(a, b, t);
         }
 
         /// <summary>
@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)
         /// <param name="v">The value in the middle.</param>
         public static float InverseLerp(float a, float b, float v)
         {
-            return CommonInternal.InverseLerp(a, b, v);
+            return CommonInternal.InverseLerpInternal(a, b, v);
         }
 
     }
diff --git a/UnityPackage/Scripts/Utilities.cs b/UnityPackage/Scripts/Utilities.cs
@@ -8,20 +8,20 @@ internal static class UtilitiesInternal
     {
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float ConvertTickToPosition(int tick, int resolution);
+        public static extern float ConvertTickToPositionInternal(int tick, int resolution);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, Tempo[] tempoChanges,
             int tempoChangesSize, TimeSignature[] timeSignatures, int timeSignaturesSize);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta);
+        public static extern bool IsOnTheBeatInternal(int bpm, float currentTime, float delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier);
+        public static extern int RoundUpToTheNearestMultiplierInternal(int value, int multiplier);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
-        public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta);
+        public static extern float CalculateAccuracyRatioInternal(int position, int currentPosition, int delta);
 
         [DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr CalculateBeatBarsInternal(Tempo[] tempoChanges, int tempoChangesSize, int resolution,
@@ -42,7 +42,7 @@ public static class Utilities
         /// <param name="resolution">The resolution of the song.</param>
         public static float ConvertTickToPosition(int tick, int resolution)
         {
-            return UtilitiesInternal.ConvertTickToPosition(tick, resolution);
+            return UtilitiesInternal.ConvertTickToPositionInternal(tick, resolution);
         }
 
         /// <summary>
@@ -67,7 +67,7 @@ public static int ConvertSecondsToTicks(float seconds, int resolution, Tempo[] t
         /// <param name="delta">The plus/minus delta to test the current time against.</param>
         public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         {
-            return UtilitiesInternal.IsOnTheBeat(bpm, currentTime, delta);
+            return UtilitiesInternal.IsOnTheBeatInternal(bpm, currentTime, delta);
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)
         /// <param name="multiplier">The multiplier to round using.</param>
         public static int RoundUpToTheNearestMultiplier(int value, int multiplier)
         {
-            return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);
+            return UtilitiesInternal.RoundUpToTheNearestMultiplierInternal(value, multiplier);
         }
 
         public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution = 192, int ts = 4,
@@ -140,7 +140,7 @@ public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution =
         /// <param name="delta">The plus/minus delta to test the current position against.</param>
         public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50)
         {
-            return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta);
+            return UtilitiesInternal.CalculateAccuracyRatioInternal(position, currentPosition, delta);
         }
 
     }
diff --git a/include/RhythmGameUtilities/Common.hpp b/include/RhythmGameUtilities/Common.hpp
@@ -51,7 +51,7 @@ extern "C"
  * @private
  */
 
-std::string Trim(const char *contents)
+inline std::string Trim(const char *contents)
 {
     return std::regex_replace(contents, std::regex("^\\s+|\\s+$"), "");
 }
@@ -64,7 +64,8 @@ std::string Trim(const char *contents)
  * @private
  */
 
-std::vector<std::string> Split(const char *contents, const char delimiter)
+inline std::vector<std::string> Split(const char *contents,
+                                      const char delimiter)
 {
     auto parts = std::vector<std::string>();
 
@@ -80,8 +81,8 @@ std::vector<std::string> Split(const char *contents, const char delimiter)
     return parts;
 }
 
-std::vector<std::string> FindAllMatches(const char *contents,
-                                        std::regex pattern)
+inline std::vector<std::string> FindAllMatches(const char *contents,
+                                               std::regex pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);
@@ -101,8 +102,8 @@ std::vector<std::string> FindAllMatches(const char *contents,
     return matches;
 }
 
-std::vector<std::string> FindMatchGroups(const char *contents,
-                                         std::regex pattern)
+inline std::vector<std::string> FindMatchGroups(const char *contents,
+                                                std::regex pattern)
 {
     auto currentMatch =
         std::cregex_iterator(contents, contents + strlen(contents), pattern);
diff --git a/include/RhythmGameUtilities/CommonInternal.hpp b/include/RhythmGameUtilities/CommonInternal.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Common.hpp"
+
+#ifdef _WIN32
+#define PACKAGE_API __declspec(dllexport)
+#else
+#define PACKAGE_API
+#endif
+
+namespace RhythmGameUtilities
+{
+
+extern "C"
+{
+    PACKAGE_API float LerpInternal(float a, float b, float t)
+    {
+        return Lerp(a, b, t);
+    }
+
+    PACKAGE_API float InverseLerpInternal(float a, float b, float v)
+    {
+        return InverseLerp(a, b, v);
+    }
+}
+
+} // namespace RhythmGameUtilities
diff --git a/include/RhythmGameUtilities/Enums/Difficulty.h b/include/RhythmGameUtilities/Enums/Difficulty.h
@@ -22,7 +22,7 @@ typedef enum Difficulty
 
 } DifficultyType;
 
-std::string ToString(Difficulty difficulty)
+inline std::string ToString(Difficulty difficulty)
 {
     switch (difficulty)
     {
diff --git a/include/RhythmGameUtilities/Enums/NamedSection.h b/include/RhythmGameUtilities/Enums/NamedSection.h
@@ -17,7 +17,7 @@ typedef enum NamedSection
     Events
 } NamedSectionType;
 
-std::string ToString(NamedSection namedSection)
+inline std::string ToString(NamedSection namedSection)
 {
     switch (namedSection)
     {
diff --git a/include/RhythmGameUtilities/Enums/TypeCode.h b/include/RhythmGameUtilities/Enums/TypeCode.h
@@ -22,7 +22,7 @@ typedef enum TypeCode
 
 } TypeCodeType;
 
-std::string ToString(TypeCode typeCode)
+inline std::string ToString(TypeCode typeCode)
 {
     switch (typeCode)
     {
diff --git a/include/RhythmGameUtilities/File.hpp b/include/RhythmGameUtilities/File.hpp
@@ -16,7 +16,7 @@ namespace RhythmGameUtilities
  * @public
  */
 
-std::vector<uint8_t> ReadBytesFromFile(const char *path)
+inline std::vector<uint8_t> ReadBytesFromFile(const char *path)
 {
     std::ifstream file(path, std::ios::binary | std::ios::ate);
 
@@ -43,7 +43,7 @@ std::vector<uint8_t> ReadBytesFromFile(const char *path)
  * @public
  */
 
-std::string ReadStringFromFile(const char *path)
+inline std::string ReadStringFromFile(const char *path)
 {
     std::ifstream file(path);
 
diff --git a/include/RhythmGameUtilities/Parsers.hpp b/include/RhythmGameUtilities/Parsers.hpp
@@ -15,12 +15,6 @@
 
 #include "Common.hpp"
 
-#ifdef _WIN32
-#define PACKAGE_API __declspec(dllexport)
-#else
-#define PACKAGE_API
-#endif
-
 namespace RhythmGameUtilities
 {
 
@@ -45,8 +39,8 @@ std::regex CHART_SECTION_LINE_PATTERN("([^=]+)\\s*=([^\\r\\n]+)");
 
 std::regex JSON_VALUE_PATTERN("(\"[^\"]+\"|\\S+)");
 
-std::map<std::string,
-         std::vector<std::pair<std::string, std::vector<std::string>>>>
+inline std::map<std::string,
+                std::vector<std::pair<std::string, std::vector<std::string>>>>
 ParseSectionsFromChart(const char *contents)
 {
     auto matches = FindAllMatches(contents, CHART_SECTION_PATTERN);
@@ -93,7 +87,7 @@ ParseSectionsFromChart(const char *contents)
     return sections;
 }
 
-std::map<std::string, std::string> ParseMetaDataFromChartSection(
+inline std::map<std::string, std::string> ParseMetaDataFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto data = std::map<std::string, std::string>();
@@ -106,7 +100,7 @@ std::map<std::string, std::string> ParseMetaDataFromChartSection(
     return data;
 }
 
-std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
+inline std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto timeSignaturesChanges = std::vector<TimeSignature>();
@@ -127,7 +121,7 @@ std::vector<TimeSignature> ParseTimeSignatureChangesFromChartSection(
     return timeSignaturesChanges;
 }
 
-std::vector<Tempo> ParseTempoChangesFromChartSection(
+inline std::vector<Tempo> ParseTempoChangesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto tempoChanges = std::vector<Tempo>();
@@ -146,7 +140,7 @@ std::vector<Tempo> ParseTempoChangesFromChartSection(
     return tempoChanges;
 }
 
-std::vector<Note> ParseNotesFromChartSection(
+inline std::vector<Note> ParseNotesFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto notes = std::vector<Note>();
@@ -164,7 +158,7 @@ std::vector<Note> ParseNotesFromChartSection(
     return notes;
 }
 
-std::map<int, std::string> ParseLyricsFromChartSection(
+inline std::map<int, std::string> ParseLyricsFromChartSection(
     std::vector<std::pair<std::string, std::vector<std::string>>> section)
 {
     auto lyrics = std::map<int, std::string>();
diff --git a/include/RhythmGameUtilities/ParsersInternal.hpp b/include/RhythmGameUtilities/ParsersInternal.hpp
@@ -15,9 +15,8 @@ namespace RhythmGameUtilities
 
 extern "C"
 {
-    PACKAGE_API
-    ChartSectionInternal *ParseSectionsFromChartInternal(const char *contents,
-                                                         int *outSize)
+    PACKAGE_API ChartSectionInternal *
+    ParseSectionsFromChartInternal(const char *contents, int *outSize)
     {
         auto internalSections = ParseSectionsFromChart(contents);
 
diff --git a/include/RhythmGameUtilities/RhythmGameUtilities.cpp b/include/RhythmGameUtilities/RhythmGameUtilities.cpp
@@ -2,6 +2,7 @@
 
 #include "Audio.hpp"
 #include "Common.hpp"
+#include "CommonInternal.hpp"
 #include "Parsers.hpp"
 #include "ParsersInternal.hpp"
 #include "Utilities.hpp"
diff --git a/include/RhythmGameUtilities/Utilities.hpp b/include/RhythmGameUtilities/Utilities.hpp
diff --git a/include/RhythmGameUtilities/UtilitiesInternal.hpp b/include/RhythmGameUtilities/UtilitiesInternal.hpp
diff --git a/tests/RhythmGameUtilities/CommonInternal.cpp b/tests/RhythmGameUtilities/CommonInternal.cpp
diff --git a/tests/RhythmGameUtilities/UtilitiesInternal.cpp b/tests/RhythmGameUtilities/UtilitiesInternal.cpp

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ public static class CommonInternal`
`7`	`7`	`{`
`8`	`8`
`9`	`9`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`10`		`- public static extern float Lerp(float a, float b, float t);`
	`10`	`+ public static extern float LerpInternal(float a, float b, float t);`
`11`	`11`
`12`	`12`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`13`		`- public static extern float InverseLerp(float a, float b, float v);`
	`13`	`+ public static extern float InverseLerpInternal(float a, float b, float v);`
`14`	`14`
`15`	`15`	`}`
`16`	`16`
`@@ -25,7 +25,7 @@ public static class Common`
`25`	`25`	`/// <param name="t">The value used for interpolation.</param>`
`26`	`26`	`public static float Lerp(float a, float b, float t)`
`27`	`27`	`{`
`28`		`- return CommonInternal.Lerp(a, b, t);`
	`28`	`+ return CommonInternal.LerpInternal(a, b, t);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/// <summary>`
`@@ -36,7 +36,7 @@ public static float Lerp(float a, float b, float t)`
`36`	`36`	`/// <param name="v">The value in the middle.</param>`
`37`	`37`	`public static float InverseLerp(float a, float b, float v)`
`38`	`38`	`{`
`39`		`- return CommonInternal.InverseLerp(a, b, v);`
	`39`	`+ return CommonInternal.InverseLerpInternal(a, b, v);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,20 +8,20 @@ internal static class UtilitiesInternal`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`11`		`- public static extern float ConvertTickToPosition(int tick, int resolution);`
	`11`	`+ public static extern float ConvertTickToPositionInternal(int tick, int resolution);`
`12`	`12`
`13`	`13`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`14`	`14`	`public static extern int ConvertSecondsToTicksInternal(float seconds, int resolution, Tempo[] tempoChanges,`
`15`	`15`	`int tempoChangesSize, TimeSignature[] timeSignatures, int timeSignaturesSize);`
`16`	`16`
`17`	`17`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`18`		`- public static extern bool IsOnTheBeat(int bpm, float currentTime, float delta);`
	`18`	`+ public static extern bool IsOnTheBeatInternal(int bpm, float currentTime, float delta);`
`19`	`19`
`20`	`20`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`21`		`- public static extern int RoundUpToTheNearestMultiplier(int value, int multiplier);`
	`21`	`+ public static extern int RoundUpToTheNearestMultiplierInternal(int value, int multiplier);`
`22`	`22`
`23`	`23`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`24`		`- public static extern float CalculateAccuracyRatio(int position, int currentPosition, int delta);`
	`24`	`+ public static extern float CalculateAccuracyRatioInternal(int position, int currentPosition, int delta);`
`25`	`25`
`26`	`26`	`[DllImport("libRhythmGameUtilities", CallingConvention = CallingConvention.Cdecl)]`
`27`	`27`	`public static extern IntPtr CalculateBeatBarsInternal(Tempo[] tempoChanges, int tempoChangesSize, int resolution,`
`@@ -42,7 +42,7 @@ public static class Utilities`
`42`	`42`	`/// <param name="resolution">The resolution of the song.</param>`
`43`	`43`	`public static float ConvertTickToPosition(int tick, int resolution)`
`44`	`44`	`{`
`45`		`- return UtilitiesInternal.ConvertTickToPosition(tick, resolution);`
	`45`	`+ return UtilitiesInternal.ConvertTickToPositionInternal(tick, resolution);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <summary>`
`@@ -67,7 +67,7 @@ public static int ConvertSecondsToTicks(float seconds, int resolution, Tempo[] t`
`67`	`67`	`/// <param name="delta">The plus/minus delta to test the current time against.</param>`
`68`	`68`	`public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)`
`69`	`69`	`{`
`70`		`- return UtilitiesInternal.IsOnTheBeat(bpm, currentTime, delta);`
	`70`	`+ return UtilitiesInternal.IsOnTheBeatInternal(bpm, currentTime, delta);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/// <summary>`
`@@ -77,7 +77,7 @@ public static bool IsOnTheBeat(int bpm, float currentTime, float delta = 0.05f)`
`77`	`77`	`/// <param name="multiplier">The multiplier to round using.</param>`
`78`	`78`	`public static int RoundUpToTheNearestMultiplier(int value, int multiplier)`
`79`	`79`	`{`
`80`		`- return UtilitiesInternal.RoundUpToTheNearestMultiplier(value, multiplier);`
	`80`	`+ return UtilitiesInternal.RoundUpToTheNearestMultiplierInternal(value, multiplier);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution = 192, int ts = 4,`
`@@ -140,7 +140,7 @@ public static BeatBar[] CalculateBeatBars(Tempo[] tempoChanges, int resolution =`
`140`	`140`	`/// <param name="delta">The plus/minus delta to test the current position against.</param>`
`141`	`141`	`public static float CalculateAccuracyRatio(int position, int currentPosition, int delta = 50)`
`142`	`142`	`{`
`143`		`- return UtilitiesInternal.CalculateAccuracyRatio(position, currentPosition, delta);`
	`143`	`+ return UtilitiesInternal.CalculateAccuracyRatioInternal(position, currentPosition, delta);`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ extern "C"`
`51`	`51`	`* @private`
`52`	`52`	`*/`
`53`	`53`
`54`		`-std::string Trim(const char *contents)`
	`54`	`+inline std::string Trim(const char *contents)`
`55`	`55`	`{`
`56`	`56`	`return std::regex_replace(contents, std::regex("^\\s+\|\\s+$"), "");`
`57`	`57`	`}`
`@@ -64,7 +64,8 @@ std::string Trim(const char *contents)`
`64`	`64`	`* @private`
`65`	`65`	`*/`
`66`	`66`
`67`		`-std::vector<std::string> Split(const char *contents, const char delimiter)`
	`67`	`+inline std::vector<std::string> Split(const char *contents,`
	`68`	`+ const char delimiter)`
`68`	`69`	`{`
`69`	`70`	`auto parts = std::vector<std::string>();`
`70`	`71`
`@@ -80,8 +81,8 @@ std::vector<std::string> Split(const char *contents, const char delimiter)`
`80`	`81`	`return parts;`
`81`	`82`	`}`
`82`	`83`
`83`		`-std::vector<std::string> FindAllMatches(const char *contents,`
`84`		`- std::regex pattern)`
	`84`	`+inline std::vector<std::string> FindAllMatches(const char *contents,`
	`85`	`+ std::regex pattern)`
`85`	`86`	`{`
`86`	`87`	`auto currentMatch =`
`87`	`88`	`std::cregex_iterator(contents, contents + strlen(contents), pattern);`
`@@ -101,8 +102,8 @@ std::vector<std::string> FindAllMatches(const char *contents,`
`101`	`102`	`return matches;`
`102`	`103`	`}`
`103`	`104`
`104`		`-std::vector<std::string> FindMatchGroups(const char *contents,`
`105`		`- std::regex pattern)`
	`105`	`+inline std::vector<std::string> FindMatchGroups(const char *contents,`
	`106`	`+ std::regex pattern)`
`106`	`107`	`{`
`107`	`108`	`auto currentMatch =`
`108`	`109`	`std::cregex_iterator(contents, contents + strlen(contents), pattern);`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ typedef enum Difficulty`
`22`	`22`
`23`	`23`	`} DifficultyType;`
`24`	`24`
`25`		`-std::string ToString(Difficulty difficulty)`
	`25`	`+inline std::string ToString(Difficulty difficulty)`
`26`	`26`	`{`
`27`	`27`	`switch (difficulty)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ typedef enum NamedSection`
`17`	`17`	`Events`
`18`	`18`	`} NamedSectionType;`
`19`	`19`
`20`		`-std::string ToString(NamedSection namedSection)`
	`20`	`+inline std::string ToString(NamedSection namedSection)`
`21`	`21`	`{`
`22`	`22`	`switch (namedSection)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ typedef enum TypeCode`
`22`	`22`
`23`	`23`	`} TypeCodeType;`
`24`	`24`
`25`		`-std::string ToString(TypeCode typeCode)`
	`25`	`+inline std::string ToString(TypeCode typeCode)`
`26`	`26`	`{`
`27`	`27`	`switch (typeCode)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace RhythmGameUtilities`
`16`	`16`	`* @public`
`17`	`17`	`*/`
`18`	`18`
`19`		`-std::vector<uint8_t> ReadBytesFromFile(const char *path)`
	`19`	`+inline std::vector<uint8_t> ReadBytesFromFile(const char *path)`
`20`	`20`	`{`
`21`	`21`	`std::ifstream file(path, std::ios::binary \| std::ios::ate);`
`22`	`22`
`@@ -43,7 +43,7 @@ std::vector<uint8_t> ReadBytesFromFile(const char *path)`
`43`	`43`	`* @public`
`44`	`44`	`*/`
`45`	`45`
`46`		`-std::string ReadStringFromFile(const char *path)`
	`46`	`+inline std::string ReadStringFromFile(const char *path)`
`47`	`47`	`{`
`48`	`48`	`std::ifstream file(path);`
`49`	`49`