diff options
Diffstat (limited to 'source/core')
| -rw-r--r-- | source/core/slang-blob.h | 2 | ||||
| -rw-r--r-- | source/core/slang-file-system.h | 4 | ||||
| -rw-r--r-- | source/core/slang-memory-file-system.h | 2 | ||||
| -rw-r--r-- | source/core/slang-shared-library.h | 2 | ||||
| -rw-r--r-- | source/core/slang-zip-file-system.cpp | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source/core/slang-blob.h b/source/core/slang-blob.h index af3206fb5..5277ef0cd 100644 --- a/source/core/slang-blob.h +++ b/source/core/slang-blob.h @@ -15,7 +15,7 @@ namespace Slang /** Base class for simple blobs. */ -class BlobBase : public ISlangBlob, public ICastable, public ComBaseObject +class BlobBase : public ComBaseObject, public ISlangBlob, public ICastable { public: // ISlangUnknown diff --git a/source/core/slang-file-system.h b/source/core/slang-file-system.h index 7ed500eb9..06d647c80 100644 --- a/source/core/slang-file-system.h +++ b/source/core/slang-file-system.h @@ -97,7 +97,7 @@ NOTE! That this behavior is the same as previously in that.... 1) calcRelativePath, just returns the path as processed by the Path:: methods 2) getUniqueIdentity behavior depends on the UniqueIdentityMode. */ -class CacheFileSystem : public ISlangFileSystemExt, public ComBaseObject +class CacheFileSystem : public ComBaseObject, public ISlangFileSystemExt { public: SLANG_CLASS_GUID(0x2f4d1d03, 0xa0d1, 0x434b, {0x87, 0x7a, 0x65, 0x5, 0xa4, 0xa0, 0x9a, 0x3b}) @@ -268,7 +268,7 @@ protected: OSPathKind m_osPathKind = OSPathKind::None; ///< OS path kind }; -class RelativeFileSystem : public ISlangMutableFileSystem, public ComBaseObject +class RelativeFileSystem : public ComBaseObject, public ISlangMutableFileSystem { public: SLANG_COM_BASE_IUNKNOWN_ALL diff --git a/source/core/slang-memory-file-system.h b/source/core/slang-memory-file-system.h index ebf6e239a..84ce6a244 100644 --- a/source/core/slang-memory-file-system.h +++ b/source/core/slang-memory-file-system.h @@ -27,7 +27,7 @@ TODO(JS): * We may want to make saveFile take a blob, or have a version that does. Doing so would allow the application to handle memory management around the blob. */ -class MemoryFileSystem : public ISlangMutableFileSystem, public ComBaseObject +class MemoryFileSystem : public ComBaseObject, public ISlangMutableFileSystem { public: // ISlangUnknown diff --git a/source/core/slang-shared-library.h b/source/core/slang-shared-library.h index fbc8a1d30..8128eee05 100644 --- a/source/core/slang-shared-library.h +++ b/source/core/slang-shared-library.h @@ -48,7 +48,7 @@ private: static DefaultSharedLibraryLoader s_singleton; }; -class DefaultSharedLibrary : public ISlangSharedLibrary, public ComBaseObject +class DefaultSharedLibrary : public ComBaseObject, public ISlangSharedLibrary { public: SLANG_CLASS_GUID(0xe7f2597b, 0xf803, 0x4b6e, {0xaf, 0x8b, 0xcb, 0xe3, 0xa2, 0x21, 0xfd, 0x5a}) diff --git a/source/core/slang-zip-file-system.cpp b/source/core/slang-zip-file-system.cpp index 9c805dc55..0d3503222 100644 --- a/source/core/slang-zip-file-system.cpp +++ b/source/core/slang-zip-file-system.cpp @@ -15,9 +15,9 @@ namespace Slang { -class ZipFileSystemImpl : public ISlangMutableFileSystem, - public IArchiveFileSystem, - public ComBaseObject +class ZipFileSystemImpl : public ComBaseObject, + public ISlangMutableFileSystem, + public IArchiveFileSystem { public: // ISlangUnknown |
