SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

micro #83

Merged
peri4 merged 14 commits from micro into master 2022-03-14 12:10:33 +03:00
Conversation 0 Commits 14 Files Changed 50 +7 -3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c3c98b9d78 - Show all commits

2
libs/main/core/pivariantsimple.h
View File

@@ -51,7 +51,7 @@ public:
#ifdef MICRO_PIP #ifdef MICRO_PIP
PIString typeName() const final {static PIString ret(PIVariant(T()).typeName()); return ret;} PIString typeName() const final {static PIString ret(PIVariant(T()).typeName()); return ret;}
#else #else
PIString typeName() const final {static PIString ret(_TYPENAME_(T)); return ret;} PIString typeName() const final {static PIString ret(typeid(T).name()); return ret;}
#endif #endif
uint hash() const final {static uint ret = typeName().hash(); return ret;} uint hash() const final {static uint ret = typeName().hash(); return ret;}
void newT(void *& ptr, const void * value) final {ptr = (void*)(new T(*(const T*)value));} void newT(void *& ptr, const void * value) final {ptr = (void*)(new T(*(const T*)value));}

8
libs/main/thread/piconditionvar.cpp
View File

@@ -17,13 +17,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "piplatform.h"
#ifdef WINDOWS
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0600
#endif
#include "piconditionvar.h" #include "piconditionvar.h"
#include "pithread.h" #include "pithread.h"
#include "pitime.h" #include "pitime.h"
#include "piincludes_p.h" #include "piincludes_p.h"
#ifdef WINDOWS #ifdef WINDOWS
# undef _WIN32_WINNT
# define _WIN32_WINNT 0x0600
# include <synchapi.h> # include <synchapi.h>
# include <windef.h> # include <windef.h>
# include <winbase.h> # include <winbase.h>