diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c9a3aba..470722e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -658,12 +658,14 @@ message(" Modules:") foreach(_m ${PIP_SRC_MODULES}) message(" ${_m}: ${PIP_MSG_${_m}}") endforeach() +message("") if (PIP_TESTS_LIST) - message("") message(" Tests:") foreach(_test ${PIP_TESTS_LIST}) message(" * ${_test}") endforeach() +else() + message(" Tests: skip (tests off)") endif() message("") message(" Utilites:") diff --git a/lib/main/core/pibytearray.h b/lib/main/core/pibytearray.h index 79fdf39b..d3d532b4 100644 --- a/lib/main/core/pibytearray.h +++ b/lib/main/core/pibytearray.h @@ -56,6 +56,10 @@ public: //! Constructs an empty byte array PIByteArray() {;} + PIByteArray(const PIByteArray & o): PIDeque(o) {} + + PIByteArray(PIByteArray && o): PIDeque(std::move(o)) {} + //! Constructs 0-filled byte array with size "size" PIByteArray(const uint size) {resize(size);} @@ -124,6 +128,10 @@ public: void operator =(const PIDeque & d) {resize(d.size()); memcpy(data(), d.data(), d.size());} + PIByteArray & operator =(const PIByteArray & o) {if (this == &o) return *this; clear(); append(o); return *this;} + + PIByteArray & operator =(PIByteArray && o) {swap(o); return *this;} + static PIByteArray fromUserInput(PIString str); static PIByteArray fromHex(PIString str); static PIByteArray fromBase64(const PIByteArray & base64); diff --git a/utils/piterminal/main.cpp b/utils/piterminal/main.cpp index d78f1a8f..eae32a9a 100644 --- a/utils/piterminal/main.cpp +++ b/utils/piterminal/main.cpp @@ -23,6 +23,8 @@ int main (int argc, char * argv[]) { return 0; } #else +# define PIP_CONSOLE_STATIC_DEFINE +# include "pip_console_export.h" # include "piscreentypes.h" # include "pisharedmemory.h" # include "pifile.h"