From 48988fbe53959ee82e4ec7edda598de79089d006 Mon Sep 17 00:00:00 2001
From: Ralph Wessel <ralph@speckle.systems>
Date: Fri, 1 Nov 2024 23:25:49 +0000
Subject: [PATCH] Updated VS projects Renamed Element/Mesh.cpp for VS
 compilation

---
 .../Element/ArchicadElementDBaseEngine.cpp    |  2 +-
 .../Record/Element/{Mesh.cpp => MeshElem.cpp} |  2 +-
 .../Record/Element/{Mesh.h => MeshElem.h}     |  0
 .../Record/Element/Setting/Conversion.h       |  2 +-
 .../Speckle/Serialise/Types/ArchicadRGB.h     |  2 +-
 SpeckleLib/SpeckleLib17.vcxproj               | 16 +++++++--
 SpeckleLib/SpeckleLib17.vcxproj.filters       | 36 +++++++++++++++++++
 7 files changed, 54 insertions(+), 6 deletions(-)
 rename SpeckleLib/Speckle/Record/Element/{Mesh.cpp => MeshElem.cpp} (99%)
 rename SpeckleLib/Speckle/Record/Element/{Mesh.h => MeshElem.h} (100%)

diff --git a/SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.cpp b/SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.cpp
index b18c2a8..055dbd5 100644
--- a/SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.cpp
+++ b/SpeckleLib/Speckle/Database/Storage/ArchicadDBase/Element/ArchicadElementDBaseEngine.cpp
@@ -16,7 +16,7 @@
 #include "Speckle/Record/Element/Beam.h"
 #include "Speckle/Record/Element/BeamSegment.h"
 #include "Speckle/Record/Element/Memo.h"
-#include "Speckle/Record/Element/Mesh.h"
+#include "Speckle/Record/Element/MeshElem.h"
 #include "Speckle/Record/Element/Morph.h"
 #include "Speckle/Record/Element/Roof.h"
 #include "Speckle/Record/Element/Shell.h"
diff --git a/SpeckleLib/Speckle/Record/Element/Mesh.cpp b/SpeckleLib/Speckle/Record/Element/MeshElem.cpp
similarity index 99%
rename from SpeckleLib/Speckle/Record/Element/Mesh.cpp
rename to SpeckleLib/Speckle/Record/Element/MeshElem.cpp
index cae7e49..a84fa83 100644
--- a/SpeckleLib/Speckle/Record/Element/Mesh.cpp
+++ b/SpeckleLib/Speckle/Record/Element/MeshElem.cpp
@@ -1,4 +1,4 @@
-#include "Speckle/Record/Element/Mesh.h"
+#include "Speckle/Record/Element/MeshElem.h"
 
 #include "Speckle/Record/Element/Quants/Surveyor.h"
 #include "Speckle/Record/Element/Setting/Conversion.h"
diff --git a/SpeckleLib/Speckle/Record/Element/Mesh.h b/SpeckleLib/Speckle/Record/Element/MeshElem.h
similarity index 100%
rename from SpeckleLib/Speckle/Record/Element/Mesh.h
rename to SpeckleLib/Speckle/Record/Element/MeshElem.h
diff --git a/SpeckleLib/Speckle/Record/Element/Setting/Conversion.h b/SpeckleLib/Speckle/Record/Element/Setting/Conversion.h
index 000185f..e3a3b36 100644
--- a/SpeckleLib/Speckle/Record/Element/Setting/Conversion.h
+++ b/SpeckleLib/Speckle/Record/Element/Setting/Conversion.h
@@ -13,7 +13,7 @@ namespace speckle::record::element {
 	/*!
 	 Convert an Archicad structure type to an element composition
 	 */
-	ModelElement::Composition convert(API_ModelElemStructureType structType) {
+	inline ModelElement::Composition convert(API_ModelElemStructureType structType) {
 		switch (structType) {
 			case API_CompositeStructure:
 				return ModelElement::Composition::skinned;
diff --git a/SpeckleLib/Speckle/Serialise/Types/ArchicadRGB.h b/SpeckleLib/Speckle/Serialise/Types/ArchicadRGB.h
index 83517a0..9ad0deb 100644
--- a/SpeckleLib/Speckle/Serialise/Types/ArchicadRGB.h
+++ b/SpeckleLib/Speckle/Serialise/Types/ArchicadRGB.h
@@ -21,7 +21,7 @@ namespace active::serialise {
 	 @param source The source string to convert
 	 @return The equivalent colour (nullopt on failure)
 	 */
-	std::optional<API_RGBColor> convertToAPI_RGBColor(const utility::String& source) {
+	inline std::optional<API_RGBColor> convertToAPI_RGBColor(const utility::String& source) {
 		auto intValue = source.toUInt32();
 		if (!intValue)
 			return std::nullopt;
diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj
index 04db11b..f94fc02 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj
+++ b/SpeckleLib/SpeckleLib17.vcxproj
@@ -93,12 +93,18 @@
     <ClInclude Include="Speckle\Record\Element\Interface\SegmentedBeam.h" />
     <ClInclude Include="Speckle\Record\Element\Interface\SegmentedColumn.h" />
     <ClInclude Include="Speckle\Record\Element\Memo.h" />
+    <ClInclude Include="Speckle\Record\Element\MeshElem.h" />
     <ClInclude Include="Speckle\Record\Element\ModelElement.h" />
+    <ClInclude Include="Speckle\Record\Element\Morph.h" />
     <ClInclude Include="Speckle\Record\Element\Quants\MaterialQuantity.h" />
     <ClInclude Include="Speckle\Record\Element\Quants\MaterialWrap.h" />
     <ClInclude Include="Speckle\Record\Element\Quants\Surveyor.h" />
+    <ClInclude Include="Speckle\Record\Element\Roof.h" />
     <ClInclude Include="Speckle\Record\Element\Setting\Conversion.h" />
     <ClInclude Include="Speckle\Record\Element\Setting\TypeSetting.h" />
+    <ClInclude Include="Speckle\Record\Element\Shell.h" />
+    <ClInclude Include="Speckle\Record\Element\Slab.h" />
+    <ClInclude Include="Speckle\Record\Element\Wall.h" />
     <ClInclude Include="Speckle\Record\Property\Group.h" />
     <ClInclude Include="Speckle\Record\Property\Propertied.h" />
     <ClInclude Include="Speckle\Record\Property\Property.h" />
@@ -183,11 +189,17 @@
     <ClCompile Include="Speckle\Record\Element\Interface\SegmentedBeam.cpp" />
     <ClCompile Include="Speckle\Record\Element\Interface\SegmentedColumn.cpp" />
     <ClCompile Include="Speckle\Record\Element\Memo.cpp" />
+    <ClCompile Include="Speckle\Record\Element\MeshElem.cpp" />
     <ClCompile Include="Speckle\Record\Element\ModelElement.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Morph.cpp" />
     <ClCompile Include="Speckle\Record\Element\Quants\MaterialQuantity.cpp" />
     <ClCompile Include="Speckle\Record\Element\Quants\MaterialWrap.cpp" />
     <ClCompile Include="Speckle\Record\Element\Quants\Surveyor.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Roof.cpp" />
     <ClCompile Include="Speckle\Record\Element\Setting\TypeSetting.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Shell.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Slab.cpp" />
+    <ClCompile Include="Speckle\Record\Element\Wall.cpp" />
     <ClCompile Include="Speckle\Record\Property\Group.cpp" />
     <ClCompile Include="Speckle\Record\Property\Propertied.cpp" />
     <ClCompile Include="Speckle\Record\Property\Property.cpp" />
@@ -336,7 +348,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>
       </SDLCheck>
-      <PreprocessorDefinitions>DEBUG;WINDOWS;ARCHICAD;ACExtension;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>DEBUG;WINDOWS;ARCHICAD;ACExtension;_SILENCE_CXX20_IS_POD_DEPRECATION_WARNING;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>false</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
@@ -376,7 +388,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WINDOWS;ARCHICAD;ACExtension;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINDOWS;ARCHICAD;ACExtension;_SILENCE_CXX20_IS_POD_DEPRECATION_WARNING;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters
index 0079ada..1f91f86 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj.filters
+++ b/SpeckleLib/SpeckleLib17.vcxproj.filters
@@ -445,6 +445,24 @@
     <ClInclude Include="Speckle\Record\Element\Setting\TypeSetting.h">
       <Filter>Speckle\Record\Element\Setting</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\MeshElem.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Morph.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Roof.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Shell.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Slab.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Element\Wall.h">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -681,6 +699,24 @@
     <ClCompile Include="Speckle\Record\Element\Setting\TypeSetting.cpp">
       <Filter>Speckle\Record\Element\Setting</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\MeshElem.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Morph.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Roof.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Shell.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Slab.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Element\Wall.cpp">
+      <Filter>Speckle\Record\Element</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">