GCC compile errors fixed

chrxh · Oct 14, 2023 · 873c84c · 873c84c
1 parent ad0ed11
commit 873c84c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/source/EngineInterface/GenomeDescriptionConverter.cpp b/source/EngineInterface/GenomeDescriptionConverter.cpp
@@ -134,7 +134,7 @@ namespace
     }
 }
 
-std::vector<uint8_t> GenomeDescriptionConverter::convertDescriptionToBytes(GenomeDescription const& genome, EncodingSpecification const& spec)
+std::vector<uint8_t> GenomeDescriptionConverter::convertDescriptionToBytes(GenomeDescription const& genome, GenomeEncodingSpecification const& spec)
 {
     auto const& cells = genome.cells;
     std::vector<uint8_t> result;
@@ -236,7 +236,7 @@ namespace
         std::vector<uint8_t> const& data,
         size_t maxBytePosition,
         size_t maxEntries,
-        GenomeDescriptionConverter::EncodingSpecification const& spec)
+        GenomeEncodingSpecification const& spec)
     {
         SimulationParameters parameters;
         ConversionResult result;
@@ -349,24 +349,24 @@ namespace
 
 }
 
-GenomeDescription GenomeDescriptionConverter::convertBytesToDescription(std::vector<uint8_t> const& data, EncodingSpecification const& spec)
+GenomeDescription GenomeDescriptionConverter::convertBytesToDescription(std::vector<uint8_t> const& data, GenomeEncodingSpecification const& spec)
 {
     return convertBytesToDescriptionIntern(data, data.size(), data.size(), spec).genome;
 }
 
-int GenomeDescriptionConverter::convertNodeAddressToNodeIndex(std::vector<uint8_t> const& data, int nodeAddress, EncodingSpecification const& spec)
+int GenomeDescriptionConverter::convertNodeAddressToNodeIndex(std::vector<uint8_t> const& data, int nodeAddress, GenomeEncodingSpecification const& spec)
 {
     //wasteful approach but sufficient for GUI
     return convertBytesToDescriptionIntern(data, nodeAddress, data.size(), spec).genome.cells.size();
 }
 
-int GenomeDescriptionConverter::convertNodeIndexToNodeAddress(std::vector<uint8_t> const& data, int nodeIndex, EncodingSpecification const& spec)
+int GenomeDescriptionConverter::convertNodeIndexToNodeAddress(std::vector<uint8_t> const& data, int nodeIndex, GenomeEncodingSpecification const& spec)
 {
     //wasteful approach but sufficient for GUI
     return convertBytesToDescriptionIntern(data, data.size(), nodeIndex, spec).lastBytePosition;
 }
 
-int GenomeDescriptionConverter::getNumNodesRecursively(std::vector<uint8_t> const& data, bool includeRepetitions, EncodingSpecification const& spec)
+int GenomeDescriptionConverter::getNumNodesRecursively(std::vector<uint8_t> const& data, bool includeRepetitions, GenomeEncodingSpecification const& spec)
 {
     auto genome = convertBytesToDescriptionIntern(data, data.size(), data.size(), spec).genome;
     auto result = toInt(genome.cells.size());

diff --git a/source/EngineInterface/GenomeDescriptionConverter.h b/source/EngineInterface/GenomeDescriptionConverter.h
@@ -5,21 +5,20 @@
 #include "GenomeDescriptions.h"
 #include "SimulationParameters.h"
 
+struct GenomeEncodingSpecification
+{
+    MEMBER_DECLARATION(GenomeEncodingSpecification, bool, numRepetitions, true);
+    MEMBER_DECLARATION(GenomeEncodingSpecification, bool, concatenationAngle1, true);
+    MEMBER_DECLARATION(GenomeEncodingSpecification, bool, concatenationAngle2, true);
+};
 
 class GenomeDescriptionConverter
 {
 public:
-    struct EncodingSpecification
-    {
-        MEMBER_DECLARATION(EncodingSpecification, bool, numRepetitions, true);
-        MEMBER_DECLARATION(EncodingSpecification, bool, concatenationAngle1, true);
-        MEMBER_DECLARATION(EncodingSpecification, bool, concatenationAngle2, true);
-    };
-
-    static std::vector<uint8_t> convertDescriptionToBytes(GenomeDescription const& genome, EncodingSpecification const& spec = EncodingSpecification());
-    static GenomeDescription convertBytesToDescription(std::vector<uint8_t> const& data, EncodingSpecification const& spec = EncodingSpecification());
+    static std::vector<uint8_t> convertDescriptionToBytes(GenomeDescription const& genome, GenomeEncodingSpecification const& spec = GenomeEncodingSpecification());
+    static GenomeDescription convertBytesToDescription(std::vector<uint8_t> const& data, GenomeEncodingSpecification const& spec = GenomeEncodingSpecification());
 
-    static int convertNodeAddressToNodeIndex(std::vector<uint8_t> const& data, int nodeAddress, EncodingSpecification const& spec = EncodingSpecification());
-    static int convertNodeIndexToNodeAddress(std::vector<uint8_t> const& data, int nodeIndex, EncodingSpecification const& spec = EncodingSpecification());
-    static int getNumNodesRecursively(std::vector<uint8_t> const& data, bool includeRepetitions, EncodingSpecification const& spec = EncodingSpecification());
+    static int convertNodeAddressToNodeIndex(std::vector<uint8_t> const& data, int nodeAddress, GenomeEncodingSpecification const& spec = GenomeEncodingSpecification());
+    static int convertNodeIndexToNodeAddress(std::vector<uint8_t> const& data, int nodeIndex, GenomeEncodingSpecification const& spec = GenomeEncodingSpecification());
+    static int getNumNodesRecursively(std::vector<uint8_t> const& data, bool includeRepetitions, GenomeEncodingSpecification const& spec = GenomeEncodingSpecification());
 };
diff --git a/source/EngineInterface/Serializer.cpp b/source/EngineInterface/Serializer.cpp
@@ -525,7 +525,7 @@ namespace cereal
                 data.genome = GenomeDescriptionConverter::convertDescriptionToBytes(genomeDesc);
 
                 auto oldVersionSpec =
-                    GenomeDescriptionConverter::EncodingSpecification().numRepetitions(false).concatenationAngle1(false).concatenationAngle2(false);
+                    GenomeEncodingSpecification().numRepetitions(false).concatenationAngle1(false).concatenationAngle2(false);
                 auto oldGenome = GenomeDescriptionConverter::convertDescriptionToBytes(genomeDesc, oldVersionSpec);
                 data.isConstructionBuilt = toInt(oldGenome.size()) <= data.genomeCurrentNodeIndex;  //in old versions genomeCurrentNodeIndex was the byte index
                 data.genomeCurrentNodeIndex = GenomeDescriptionConverter::convertNodeAddressToNodeIndex(oldGenome, data.genomeCurrentNodeIndex, oldVersionSpec);