From 9475b11045089c9bc9773b16f7eb84f843db70c4 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 1 Apr 2021 18:59:24 -0400 Subject: Associating GUID (or UUID) with types (#1776) * #include an absolute path didn't work - because paths were taken to always be relative. * Add mechanism to embed guid inside of type. --- source/core/slang-zip-file-system.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source/core/slang-zip-file-system.cpp') diff --git a/source/core/slang-zip-file-system.cpp b/source/core/slang-zip-file-system.cpp index a56ba09db..1ed003d55 100644 --- a/source/core/slang-zip-file-system.cpp +++ b/source/core/slang-zip-file-system.cpp @@ -19,12 +19,6 @@ namespace Slang { -// Allocate static const storage for the various interface IDs that the Slang API needs to expose -static const Guid IID_ISlangUnknown = SLANG_UUID_ISlangUnknown; -static const Guid IID_ISlangFileSystem = SLANG_UUID_ISlangFileSystem; -static const Guid IID_ISlangFileSystemExt = SLANG_UUID_ISlangFileSystemExt; -static const Guid IID_ISlangMutableFileSystem = SLANG_UUID_ISlangMutableFileSystem; - class ZipFileSystemImpl : public ArchiveFileSystem { public: @@ -108,7 +102,7 @@ protected: ISlangMutableFileSystem* ZipFileSystemImpl::getInterface(const Guid& guid) { - return (guid == IID_ISlangUnknown || guid == IID_ISlangFileSystem || guid == IID_ISlangFileSystemExt || guid == IID_ISlangMutableFileSystem) ? static_cast(this) : nullptr; + return (guid == ISlangUnknown::getTypeGuid() || guid == ISlangFileSystem::getTypeGuid() || guid == ISlangFileSystemExt::getTypeGuid() || guid == ISlangMutableFileSystem::getTypeGuid()) ? static_cast(this) : nullptr; } // This is a very awkward hack to make it so we can get a read func, without having to implement all of the tracking etc. -- cgit v1.2.3