From f9710d50bc675ddba51cc6d94b125ba1549708a8 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Wed, 17 Oct 2018 11:57:33 -0400
Subject: IncludeFileSystem -> DefaultFileSystem (#677)

Improvements in 'singleton'ness of DefaultFileSystem
Made WrapFileSystem a stand alone type - to remove 'odd' aspects of deriving from DefaultFileSystem (such as inheriting getSingleton method/fixing ref counting)
Simplified CompileRequest::loadFile - becauce fileSystemExt is always available.
---
 source/slang/include-file-system.h | 81 --------------------------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 source/slang/include-file-system.h

(limited to 'source/slang/include-file-system.h')

diff --git a/source/slang/include-file-system.h b/source/slang/include-file-system.h
deleted file mode 100644
index 4b34c2a0f..000000000
--- a/source/slang/include-file-system.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef SLANG_INCLUDE_FILE_SYSTEM_H_INCLUDED
-#define SLANG_INCLUDE_FILE_SYSTEM_H_INCLUDED
-
-#include "../../slang.h"
-#include "../../slang-com-helper.h"
-#include "../../slang-com-ptr.h"
-
-namespace Slang
-{
-
-class IncludeFileSystem : public ISlangFileSystemExt
-{
-public:
-    // ISlangUnknown
-    SLANG_IUNKNOWN_ALL
-        
-    // ISlangFileSystem
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL loadFile(
-        char const*     path,
-        ISlangBlob**    outBlob) SLANG_OVERRIDE;
-
-    // ISlangFileSystemExt
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL getCanoncialPath(
-            const char* path,
-            ISlangBlob** canonicalPathOut) SLANG_OVERRIDE;
-
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL calcRelativePath(
-        SlangPathType fromPathType,
-        const char* fromPath,
-        const char* path,
-        ISlangBlob** pathOut) SLANG_OVERRIDE;
-
-        /// Get a default instance
-    static ISlangFileSystemExt* getDefault();
-
-protected:
-  
-        /// If no ref, add one to the ref
-    void ensureRef() { m_refCount += (m_refCount == 0); }
-
-    ISlangUnknown* getInterface(const Guid& guid);
-    uint32_t m_refCount = 0;
-};
-
-/* Wraps an ISlangFileSystem, and provides the extra methods required to make a ISlangFileSystemExt 
-interface, deferring to the contained file system to do reading. 
-
-NOTE! That this behavior is the same as previously in that.... 
-1) getRelativePath, just returns the path as processed by the Path:: methods 
-2) getCanonicalPath, just returns the input path as the 'canonical' path. This will be wrong with a file multiply referenced through paths with .. and or . but 
-doing it this way means it works as before and requires no new functions.
-*/
-class WrapFileSystem : public IncludeFileSystem
-{
-public:
-    // So we don't need virtual dtor
-    SLANG_IUNKNOWN_RELEASE
-
-    // ISlangFileSystem
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL loadFile(
-        char const*     path,
-        ISlangBlob**    outBlob) SLANG_OVERRIDE;
-
-    // ISlangFileSystemExt
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL getCanoncialPath(
-        const char* path,
-        ISlangBlob** canonicalPathOut) SLANG_OVERRIDE;
-
-        /// Ctor
-    WrapFileSystem(ISlangFileSystem* fileSystem):
-        m_fileSystem(fileSystem)
-    {
-    }
-
-protected:
-    ComPtr<ISlangFileSystem> m_fileSystem;                  ///< The wrapped file system
-};
-
-}
-
-#endif
\ No newline at end of file
-- 
cgit v1.2.3