summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/core/slang-blob.h2
-rw-r--r--source/core/slang-file-system.h4
-rw-r--r--source/core/slang-memory-file-system.h2
-rw-r--r--source/core/slang-shared-library.h2
-rw-r--r--source/core/slang-zip-file-system.cpp6
-rw-r--r--source/slang-llvm/slang-llvm.cpp2
-rw-r--r--source/slang/slang-emit-vm.cpp2
-rw-r--r--source/slang/slang-serialize-ast.cpp6
-rw-r--r--source/slang/slang-serialize.h4
-rw-r--r--source/slang/slang-vm-bytecode.cpp8
-rw-r--r--source/slang/slang-workspace-version.h2
11 files changed, 20 insertions, 20 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
diff --git a/source/slang-llvm/slang-llvm.cpp b/source/slang-llvm/slang-llvm.cpp
index e645fb3c7..2860874b5 100644
--- a/source/slang-llvm/slang-llvm.cpp
+++ b/source/slang-llvm/slang-llvm.cpp
@@ -175,7 +175,7 @@ public:
/* This implementation uses atomic ref counting to ensure the shared libraries lifetime can outlive
the LLVMDownstreamCompileResult and the compilation that created it */
-class LLVMJITSharedLibrary : public ISlangSharedLibrary, public ComBaseObject
+class LLVMJITSharedLibrary : public ComBaseObject, public ISlangSharedLibrary
{
public:
// ISlangUnknown
diff --git a/source/slang/slang-emit-vm.cpp b/source/slang/slang-emit-vm.cpp
index fc0b4432e..772d9f84a 100644
--- a/source/slang/slang-emit-vm.cpp
+++ b/source/slang/slang-emit-vm.cpp
@@ -260,7 +260,7 @@ public:
uint32_t extOp,
ArrayView<VMOperand> operands)
{
- VMInstHeader instHeader;
+ VMInstHeader instHeader = {};
instHeader.opcode = op;
instHeader.opcodeExtension = extOp;
instHeader.operandCount = (uint16_t)operands.getCount();
diff --git a/source/slang/slang-serialize-ast.cpp b/source/slang/slang-serialize-ast.cpp
index 02dd374c1..9fa338449 100644
--- a/source/slang/slang-serialize-ast.cpp
+++ b/source/slang/slang-serialize-ast.cpp
@@ -136,7 +136,7 @@ void serialize(Serializer const& serializer, SemanticVersion& value)
void serialize(Serializer const& serializer, SyntaxClass<NodeBase>& value)
{
- ASTNodeType raw;
+ ASTNodeType raw = ASTNodeType(0);
if (isWriting(serializer))
{
raw = value.getTag();
@@ -277,7 +277,7 @@ void serialize(Serializer const& serializer, CapabilityAtomSet& value)
{
while (hasElements(serializer))
{
- CapabilityAtom atom;
+ CapabilityAtom atom = CapabilityAtom(0);
serialize(serializer, atom);
value.add(UInt(atom));
}
@@ -769,7 +769,7 @@ void ASTDecodingContext::handleASTNode(NodeBase*& outNode)
{
ASTSerializer serializer(this);
- ASTNodeType typeTag;
+ ASTNodeType typeTag = ASTNodeType(0);
serialize(serializer, typeTag);
switch (_getPseudoASTNodeType(typeTag))
{
diff --git a/source/slang/slang-serialize.h b/source/slang/slang-serialize.h
index b962ee2b7..591f43139 100644
--- a/source/slang/slang-serialize.h
+++ b/source/slang/slang-serialize.h
@@ -859,7 +859,7 @@ void serialize(S const& serializer, Dictionary<K, V>& value)
value.clear();
while (hasElements(serializer))
{
- KeyValuePair<K, V> pair;
+ KeyValuePair<K, V> pair{K(), V()};
serialize(serializer, pair);
value.add(pair.key, pair.value);
}
@@ -880,7 +880,7 @@ void serialize(S const& serializer, OrderedDictionary<K, V>& value)
value.clear();
while (hasElements(serializer))
{
- KeyValuePair<K, V> pair;
+ KeyValuePair<K, V> pair{K(), V()};
serialize(serializer, pair);
value.add(pair.key, pair.value);
}
diff --git a/source/slang/slang-vm-bytecode.cpp b/source/slang/slang-vm-bytecode.cpp
index 1eafa4e57..bf16805b8 100644
--- a/source/slang/slang-vm-bytecode.cpp
+++ b/source/slang/slang-vm-bytecode.cpp
@@ -328,28 +328,28 @@ void printVMInst(StringBuilder& sb, VMModuleView* moduleView, VMInstHeader* inst
{
case OperandDataType::Int32:
{
- int32_t val;
+ int32_t val = 0;
moduleView->getConstant<int32_t>(operand, val);
sb << "i32(" << val << ")";
continue;
}
case OperandDataType::Int64:
{
- int64_t val;
+ int64_t val = 0;
moduleView->getConstant<int64_t>(operand, val);
sb << "i64(" << val << ")";
continue;
}
case OperandDataType::Float32:
{
- float val;
+ float val = 0.f;
moduleView->getConstant<float>(operand, val);
sb << "f32(" << val << ")";
continue;
}
case OperandDataType::Float64:
{
- double val;
+ double val = 0.0;
moduleView->getConstant<double>(operand, val);
sb << "f32(" << val << ")";
continue;
diff --git a/source/slang/slang-workspace-version.h b/source/slang/slang-workspace-version.h
index 711504afb..1a12a2b42 100644
--- a/source/slang/slang-workspace-version.h
+++ b/source/slang/slang-workspace-version.h
@@ -159,7 +159,7 @@ struct OwnedPreprocessorMacroDefinition
String name;
String value;
};
-class Workspace : public ISlangFileSystem, public ComObject
+class Workspace : public ComObject, public ISlangFileSystem
{
private:
RefPtr<WorkspaceVersion> currentVersion;