From 8dacace7ae781817db1c47a8e38ffc61be8a4cc8 Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Sun, 4 Sep 2016 00:46:12 +0300 Subject: [PATCH] Fix duplicate member name in system property class. Also adjust several names to prevent possible collisions like this in the future. --- source/Library/System/Path.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/Library/System/Path.cpp b/source/Library/System/Path.cpp index 741d2ffe..4a6e1620 100644 --- a/source/Library/System/Path.cpp +++ b/source/Library/System/Path.cpp @@ -1724,11 +1724,14 @@ void Register_SysPath(HSQUIRRELVM vm) .Func(_SC("_tostring"), &SysPath::ToString) // Properties .Prop(_SC("String"), &SysPath::ToString, &SysPath::FromString) - .Prop(_SC("Absolute"), &SysPath::IsAbsolute) - .Prop(_SC("Relative"), &SysPath::IsRelative) - .Prop(_SC("Directory"), &SysPath::IsDirectory) - .Prop(_SC("File"), &SysPath::IsFile) - .Prop(_SC("Empty"), &SysPath::Empty) + .Prop(_SC("IsAbs"), &SysPath::IsAbsolute) + .Prop(_SC("IsAbsolute"), &SysPath::IsAbsolute) + .Prop(_SC("IsRel"), &SysPath::IsRelative) + .Prop(_SC("IsRelative"), &SysPath::IsRelative) + .Prop(_SC("IsDir"), &SysPath::IsDirectory) + .Prop(_SC("IsDirectory"), &SysPath::IsDirectory) + .Prop(_SC("IsFile"), &SysPath::IsFile) + .Prop(_SC("IsEmpty"), &SysPath::Empty) .Prop(_SC("Drive"), &SysPath::GetDrive, &SysPath::SetDrive) .Prop(_SC("Depth"), &SysPath::Depth) .Prop(_SC("Filename"), &SysPath::GetFilename, &SysPath::SqSetFilename)