Changeset 1130 for cpp/common/nonstd_stl.h

Timestamp:

04/16/21 15:55:34 (3 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/common/nonstd_stl.h (modified) (4 diffs)

cpp/common/nonstd_stl.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -6 +6 @@
 #define _NONSTD_STL_H_
 
-//stl jak sama nazwa glosi wcale nie jest nonstd
+//making STL more standard
 
 #include <string>
 using std::string;
-#ifndef SHP //bada nie ma wstring
+#ifndef SHP //STL in the bada OS has no wstring
 using std::wstring;
 #endif
@@ -17 +17 @@
 using std::vector;
 
-#include <algorithm> //std::min,max,swap
-using std::min;
-using std::max;
-using std::swap;
 
+//below: not used since 2020 (these macros are replaced by std::ssize()), may be removed...
 
 // ------------------- ARRAY_LENGTH -------------------
 
-//staromodne makro, niezabezpieczone przed uzyciem wskaznika w roli "x"
+//old-fashioned macro, unprotected against the use of the pointer as "x"
 //#define ARRAY_LENGTH(x) (sizeof(x)/sizeof((x)[0]))
 
-//hakerskie makro ktore wykrywa czesc pomy³kowych przypadkow uzycia
+//hacker macro that detects some of the misuse cases
 //#define ARRAY_LENGTH(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
 
-//szablonowa funkcja pisana przez sredniozaawansowanych, jak to funkcja - nie daje niestety sta³ej w czasie kompilacji
+//template function by intermediate-level devs, as a function it unfortunately does not give a constant at compile time
 //template<typename T, std::size_t N> inline std::size_t ARRAY_LENGTH( T(&)[N] ) { return N; } //"constexpr" dopiero w C++0x
 
-//szablony hakerskie: tablica bajtow o dlugosci N - tak dluga jak tablica o któr¹ pytamy...
+//hacker templates: array of bytes of length N - as long as the array we are asking for...
 //template <typename T, std::size_t N>
 //char (&array_temp(T (&a)[N]))[N];
@@ -44 +41 @@
 //char (&array_temp(const T (&a)[N]))[N];
 
-//...ktor¹ mozna potem uzyc normalnie w sizeof i dzieki temu mamy const w compile-time. tak uzyteczne jak staromodne makro ale z pelna kontrola bledow
+//...which can then be used in sizeof and thus we have const in compile-time. This is as useful as the old-fashioned macro above, but with full error control
 //#define ARRAY_LENGTH(x) sizeof(array_temp(x))
 
 //final and no longer needed version ;-) (c++17)
-#define ARRAY_LENGTH(x) int(std::size(x))
+//#define ARRAY_LENGTH(x) int(std::size(x))
+//(still room for improvement because unsigned=risky, ssize() upcoming since C++20)