From e2ab93dfac84f052a3e139424c2aa26f0982dc35 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Mon, 9 Sep 2019 04:21:01 -0700 Subject: [PATCH] Update submodules --- .idea/markdown-navigator/profiles_settings.xml | 3 --- Runtime/CBasicsPC.cpp | 6 ++---- amuse | 2 +- hecl | 2 +- nod | 2 +- specter | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 .idea/markdown-navigator/profiles_settings.xml diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml deleted file mode 100644 index db0626632..000000000 --- a/.idea/markdown-navigator/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Runtime/CBasicsPC.cpp b/Runtime/CBasicsPC.cpp index 5dd488971..904af0f50 100644 --- a/Runtime/CBasicsPC.cpp +++ b/Runtime/CBasicsPC.cpp @@ -59,16 +59,14 @@ u64 CBasics::GetGCTicks() { const u64 CBasics::SECONDS_TO_2000 = 946684800LL; const u64 CBasics::TICKS_PER_SECOND = 60750000LL; -#ifndef _WIN32 static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOff) { +#ifndef _WIN32 auto ret = ::localtime_r(&time, &timeSt); if (!ret) return nullptr; gmtOff = ret->tm_gmtoff; return ret; -} #else -static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOff) { struct tm _gmSt; auto reta = localtime_s(&timeSt, &time); auto retb = gmtime_s(&_gmSt, &time); @@ -76,8 +74,8 @@ static struct tm* localtime_r(const time_t& time, struct tm& timeSt, long& gmtOf return nullptr; gmtOff = mktime(&timeSt) - mktime(&_gmSt); return &timeSt; -} #endif +} OSTime CBasics::ToWiiTime(std::chrono::system_clock::time_point time) { auto sec = std::chrono::time_point_cast(time); diff --git a/amuse b/amuse index d88b14c38..6c07ec907 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit d88b14c38abf61a518f645b1a43ea59631679302 +Subproject commit 6c07ec907af7e54a33f57eff6d169415ffb3b9f9 diff --git a/hecl b/hecl index eaa8eebbd..573e53d9a 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit eaa8eebbd7e0ca17e36d255e598b745a2f63e4ca +Subproject commit 573e53d9a5e4a506ade16d9da4aaf1a1fbc74c2a diff --git a/nod b/nod index acdadaf96..ba0c2b784 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit acdadaf963328348f64e5309c5e1380df90e1a67 +Subproject commit ba0c2b78434843eac48e7c60b4d65ce7e2be11c1 diff --git a/specter b/specter index 2b9863cd4..5bf7a6076 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 2b9863cd475e7f311632aaeb170c5aba40382dcd +Subproject commit 5bf7a6076b417776a14aeb4c9aa879edca0873a4