Changeset 1340

Timestamp:

05/06/25 23:06:50 (2 days ago)

Author:

Maciej Komosinski

Message:

Added helper functions

Location:

cpp/common

Files:

• nonstd_span.h (modified) (2 diffs)
• util-stl.h (modified) (2 diffs)

cpp/common/nonstd_span.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 2019-2022  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 2019-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #ifndef _NONSTD_SPAN_H_
 #define _NONSTD_SPAN_H_
+
+#include <string>
+#include <vector>
 
 // Remove this and use std::span when available (c++20)
@@ -44 +47 @@
 };
 
+inline std::string stringFromSpan(const span<uint8_t>& s) { return std::string(s.begin(), s.end()); }
+inline std::string stringFromSpan(const span<char>& s) { return std::string(s.begin(), s.end()); }
+// in both lines below, in the last argument, &*v.end() was replaced by front+size, because the debugging+extensive checking version of the STL library with std::vector complained when calling &*v.end().
+inline span<uint8_t> spanFromVector(std::vector<uint8_t>& v) { return span<uint8_t>(&v.front(), ((uint8_t*)&v.front())+v.size()); }
+inline span<uint8_t> spanFromVector(std::vector<char>& v) { return span<uint8_t>((uint8_t*)&v.front(), ((uint8_t*)&v.front())+v.size()); }
+
 #endif

cpp/common/util-stl.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2025  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -26 +26 @@
         if (it != v.end())
                 v.erase(it);
+}
+
+// c++17 implementation of c++20 std::vector::erase_if()
+template<typename T,typename P> void erase_if(vector<T>& v, P predicate)
+{
+        v.erase(std::remove_if(v.begin(), v.end(), predicate), v.end());
 }