Changeset 1341

Timestamp:

05/06/25 23:08:08 (22 hours ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp

Files:

• common/util-file.h (modified) (1 diff)
• frams/config/version.h (modified) (1 diff)
• frams/genetics/fS/fS_general.cpp (modified) (4 diffs)
• frams/util/sstringutils.cpp (modified) (2 diffs)

cpp/common/util-file.h

@@ -19 +19 @@
 bool writeCompleteFile(const char* filename, const span<char>& data, bool warn_on_fail = true);
 bool writeCompleteFile(const char* filename, const span<uint8_t>& data, bool warn_on_fail = true);
-bool writeCompleteFile(const char* filename, const vector<char>& data, bool warn_on_fail);
+bool writeCompleteFile(const char* filename, const vector<char>& data, bool warn_on_fail = true);
 #ifdef USE_VIRTFILE
 string readUntilEOL(VirtFILE *f);

cpp/frams/config/version.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2025  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
-#define MAIN_REL_ID "5.0"
-#define VERSION_INT 23
+#define MAIN_REL_ID "5.2"
+#define VERSION_INT 25
 
 
 #ifdef IPHONE
         // in the "About" window, display both MAIN_REL_ID and the version compatible with Apple's ideas about versioning
-        #define IOS_VERSION "5.0.7" //for Apple, this can't be arbitrary text (like MAIN_REL_ID could be) as in some other platforms, so let's make it "Framsticks version (disregarding "rc", "beta" etc.)" + dot + "number increased on each release"
+        #define IOS_VERSION "5.2" //for Apple, this can't be arbitrary text (like MAIN_REL_ID could be) as in some other platforms, so let's make it "Framsticks version (disregarding "rc", "beta" etc.)" + dot + "number increased on each release"
         #define VERSION_FOR_MOBI_ABOUT IOS_VERSION "<br><small>(Framsticks " MAIN_REL_ID ")</small>" //...but still display the true internal Framsticks version
 #else

cpp/frams/genetics/fS/fS_general.cpp

@@ -648 +648 @@
         vector<Node*> allNodes;
         getAllNodes(allNodes);
-        return allNodes.size();
+        return int(allNodes.size());
 }
 
@@ -667 +667 @@
 
                 std::vector<SString> paramStrings;
-                strSplit(SString(geno.c_str(), modeSeparatorIndex), ',', false, paramStrings);
+                strSplit(SString(geno.c_str(), (int)modeSeparatorIndex), ',', false, paramStrings);
 
                 if(paramStrings.size() >= 1 && paramStrings[0] != "")
@@ -684 +684 @@
                 }
 
-                int genoStart = modeSeparatorIndex + 1;
+                int genoStart = int(modeSeparatorIndex) + 1;
                 Substring substring(geno.c_str(), genoStart, int(geno.length()) - genoStart);
                 startNode = new Node(substring, nullptr, genotypeParams);
@@ -879 +879 @@
 void fS_Genotype::validateNeuroInputs()
 {
-
         // Validate neuro input numbers
         vector<fS_Neuron*> allNeurons = getAllNeurons();
-        int allNeuronsSize = allNeurons.size();
+        size_t allNeuronsSize = allNeurons.size();
         for(int i=0; i<allNeuronsSize; i++)
         {

cpp/frams/util/sstringutils.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2022  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2025  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
+#include <inttypes.h> //PRIu64
 #include "sstringutils.h"
 #include <common/virtfile/virtfile.h>
@@ -352 +353 @@
 SString getUIDString(uint64_t uid, char prefix)
 {
-        return SString::sprintf("%c" UINT64_FORMAT, prefix, uid);
+        return SString::sprintf("%c%" PRIu64, prefix, uid);
 }