From b7456ea5a1165e81fe371d6d4bb7236bc2bd5198 Mon Sep 17 00:00:00 2001
From: Muximize <Muximize@users.noreply.github.com>
Date: Sun, 7 Jan 2024 01:08:15 +0100
Subject: [PATCH] Fix some ambiguity issues

---
 .../CustomCode/MassConcentrationTests.cs      |  2 +-
 .../Quantities/MassConcentration.extra.cs     | 20 +++++++++++++++++--
 .../Quantities/MassFraction.extra.cs          |  4 ++--
 .../CustomCode/Quantities/Molarity.extra.cs   |  2 +-
 .../Quantities/VolumeConcentration.extra.cs   |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/UnitsNet.Tests/CustomCode/MassConcentrationTests.cs b/UnitsNet.Tests/CustomCode/MassConcentrationTests.cs
index 9b7f2432fa..d85b6b24bb 100644
--- a/UnitsNet.Tests/CustomCode/MassConcentrationTests.cs
+++ b/UnitsNet.Tests/CustomCode/MassConcentrationTests.cs
@@ -131,7 +131,7 @@ public static void ComponentMassFromMassConcentrationAndSolutionVolume(
             var massConcentration = new MassConcentration(massConcValue, massConcUnit);
             var volume = new Volume(volumeValue, volumeUnit);
 
-            Mass massComponent = massConcentration * volume;
+            Mass massComponent = (Density)massConcentration * volume;
 
             AssertEx.EqualTolerance(expectedMassValue, massComponent.As(expectedMassUnit), tolerance);
         }
diff --git a/UnitsNet/CustomCode/Quantities/MassConcentration.extra.cs b/UnitsNet/CustomCode/Quantities/MassConcentration.extra.cs
index 569c228523..0e3db4646e 100644
--- a/UnitsNet/CustomCode/Quantities/MassConcentration.extra.cs
+++ b/UnitsNet/CustomCode/Quantities/MassConcentration.extra.cs
@@ -5,13 +5,29 @@ namespace UnitsNet
 {
     public partial struct MassConcentration
     {
+        /// <summary>
+        ///     Because Density and MassConcentration are almost the same, we can convert between them.
+        /// </summary>
+        public static implicit operator MassConcentration(Density density)
+        {
+            return From(density.ToUnit(Density.BaseUnit).Value, BaseUnit);
+        }
+
+        /// <summary>
+        ///     Because Density and MassConcentration are almost the same, we can convert between them.
+        /// </summary>
+        public static explicit operator Density(MassConcentration massConcentration)
+        {
+            return Density.From(massConcentration.ToUnit(BaseUnit).Value, Density.BaseUnit);
+        }
+        
         /// <summary>
         ///     Get <see cref="Molarity" /> from this <see cref="MassConcentration" /> using the known component <see cref="MolarMass" />.
         /// </summary>
         /// <param name="molecularWeight"></param>
         public Molarity ToMolarity(MolarMass molecularWeight)
         {
-            return this / molecularWeight;
+            return (Density)this / molecularWeight;
         }
 
         /// <summary>
@@ -21,7 +37,7 @@ public Molarity ToMolarity(MolarMass molecularWeight)
         /// <returns></returns>
         public VolumeConcentration ToVolumeConcentration(Density componentDensity)
         {
-            return this / componentDensity;
+            return VolumeConcentration.FromDecimalFractions((Density)this / componentDensity);
         }
 
         #region Static Methods
diff --git a/UnitsNet/CustomCode/Quantities/MassFraction.extra.cs b/UnitsNet/CustomCode/Quantities/MassFraction.extra.cs
index b7c1112740..56e9db8187 100644
--- a/UnitsNet/CustomCode/Quantities/MassFraction.extra.cs
+++ b/UnitsNet/CustomCode/Quantities/MassFraction.extra.cs
@@ -11,7 +11,7 @@ public partial struct MassFraction
         /// <returns>The actual mass of the component involved in this mixture</returns>
         public Mass GetComponentMass(Mass totalMass)
         {
-            return totalMass * this;
+            return totalMass * DecimalFractions;
         }
 
         /// <summary>
@@ -21,7 +21,7 @@ public Mass GetComponentMass(Mass totalMass)
         /// <returns>The total mass of the mixture</returns>
         public Mass GetTotalMass(Mass componentMass)
         {
-            return componentMass / this;
+            return componentMass / DecimalFractions;
         }
 
         #region Static Methods
diff --git a/UnitsNet/CustomCode/Quantities/Molarity.extra.cs b/UnitsNet/CustomCode/Quantities/Molarity.extra.cs
index 32203f21f7..92be3d10d4 100644
--- a/UnitsNet/CustomCode/Quantities/Molarity.extra.cs
+++ b/UnitsNet/CustomCode/Quantities/Molarity.extra.cs
@@ -20,7 +20,7 @@ public MassConcentration ToMassConcentration(MolarMass molecularWeight)
         /// <param name="componentMass"></param>
         public VolumeConcentration ToVolumeConcentration(Density componentDensity, MolarMass componentMass)
         {
-            return this * componentMass / componentDensity;
+            return VolumeConcentration.FromDecimalFractions(this * componentMass / componentDensity);
         }
 
         #region Static Methods
diff --git a/UnitsNet/CustomCode/Quantities/VolumeConcentration.extra.cs b/UnitsNet/CustomCode/Quantities/VolumeConcentration.extra.cs
index 205acf77e3..2f6fd4624a 100644
--- a/UnitsNet/CustomCode/Quantities/VolumeConcentration.extra.cs
+++ b/UnitsNet/CustomCode/Quantities/VolumeConcentration.extra.cs
@@ -43,7 +43,7 @@ public static VolumeConcentration FromVolumes(Volume componentVolume, Volume mix
         /// <param name="componentMolarMass"></param>
         public static VolumeConcentration FromMolarity(Molarity molarity, Density componentDensity, MolarMass componentMolarMass)
         {
-            return molarity * componentMolarMass / componentDensity;
+            return FromDecimalFractions(molarity * componentMolarMass / componentDensity);
         }
 
         #endregion