From 935a38607b8c455de60d340438cf614c1c460d44 Mon Sep 17 00:00:00 2001 From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com> Date: Thu, 14 Sep 2023 19:45:55 +0200 Subject: [PATCH] Bump version number --- README.md | 4 ++++ oscar64/Declaration.cpp | 2 +- oscar64/oscar64.cpp | 2 +- oscar64/oscar64.rc | 8 ++++---- oscar64setup/oscar64setup.vdproj | 6 +++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 99c82ea..1d9be93 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,10 @@ Supported Features: * default parameters for class members and functions * templates * vector, array and list template classes +* lambda functions +* auto variables, parameters and return types +* for range loop +* constexpr compile time evaluation ## Installation and Usage diff --git a/oscar64/Declaration.cpp b/oscar64/Declaration.cpp index 663ba6b..850aeff 100644 --- a/oscar64/Declaration.cpp +++ b/oscar64/Declaration.cpp @@ -1799,7 +1799,7 @@ bool Declaration::IsSameParams(const Declaration* dec) const if (ld->mValue != rd->mValue) return false; } - else if (ld->mType == DT_TYPE_TEMPLATE || ld->mType == DT_CONST_TEMPLATE) + else if (!ld->mBase || !rd->mBase) return false; else if (!ld->mBase->IsSame(rd->mBase)) return false; diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp index 53d3af2..2653d13 100644 --- a/oscar64/oscar64.cpp +++ b/oscar64/oscar64.cpp @@ -74,7 +74,7 @@ int main2(int argc, const char** argv) #else strcpy(strProductName, "oscar64"); - strcpy(strProductVersion, "1.24.217"); + strcpy(strProductVersion, "1.25.218"); #ifdef __APPLE__ uint32_t length = sizeof(basePath); diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc index a49c3fd..1fbb7d2 100644 --- a/oscar64/oscar64.rc +++ b/oscar64/oscar64.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,217,0 - PRODUCTVERSION 1,24,217,0 + FILEVERSION 1,25,218,0 + PRODUCTVERSION 1,25,218,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,12 +43,12 @@ BEGIN BEGIN VALUE "CompanyName", "oscar64" VALUE "FileDescription", "oscar64 compiler" - VALUE "FileVersion", "1.24.217.0" + VALUE "FileVersion", "1.25.218.0" VALUE "InternalName", "oscar64.exe" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "oscar64.exe" VALUE "ProductName", "oscar64" - VALUE "ProductVersion", "1.24.217.0" + VALUE "ProductVersion", "1.25.218.0" END END BLOCK "VarFileInfo" diff --git a/oscar64setup/oscar64setup.vdproj b/oscar64setup/oscar64setup.vdproj index db7ea13..3e511e2 100644 --- a/oscar64setup/oscar64setup.vdproj +++ b/oscar64setup/oscar64setup.vdproj @@ -5686,15 +5686,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:oscar64" - "ProductCode" = "8:{DC3B50CD-E9C6-4F59-9E59-986778C41793}" - "PackageCode" = "8:{DB830FCB-0CA0-4992-9D69-E76D9CA18459}" + "ProductCode" = "8:{041674C8-9934-4E51-B424-DA00BD3E2C89}" + "PackageCode" = "8:{7F8F7803-BF9B-423B-AD7F-ABAFD9B5DC8F}" "UpgradeCode" = "8:{9AB61EFF-ACAC-4079-9950-8D96615CD4EF}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.24.217" + "ProductVersion" = "8:1.25.218" "Manufacturer" = "8:oscar64" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"