Changeset 1027 for cpp

Timestamp:

11/26/20 01:12:15 (4 years ago)

Author:

Maciej Komosinski

Message:

#defined ARRAY_LENGTH(x) replaced by std::size(x) since C++17

File:

• cpp/common/nonstd_stl.h (modified) (1 diff)

cpp/common/nonstd_stl.h

@@ -35 +35 @@
 
 //szablony hakerskie: tablica bajtow o dlugosci N - tak dluga jak tablica o któr¹ pytamy...
-template <typename T, std::size_t N>
-char (&array_temp(T (&a)[N]))[N];
+//template <typename T, std::size_t N>
+//char (&array_temp(T (&a)[N]))[N];
 
 // As litb noted in comments, you need this overload to handle array rvalues
 // correctly (e.g. when array is a member of a struct returned from function),
 // since they won't bind to non-const reference in the overload above.
-template <typename T, std::size_t N>
-char (&array_temp(const T (&a)[N]))[N];
+//template <typename T, std::size_t N>
+//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
-#define ARRAY_LENGTH(x) sizeof(array_temp(x))
+//#define ARRAY_LENGTH(x) sizeof(array_temp(x))
+
+//final and no longer needed version ;-) (c++17)
+#define ARRAY_LENGTH(x) std::size(x)