1 files changed, 34 insertions, 35 deletions
diff --git a/source/slang/slang-serialize-riff.cpp b/source/slang/slang-serialize-riff.cpp
index fb8acd2bd..ff16dbf53 100644
--- a/source/slang/slang-serialize-riff.cpp
+++ b/source/slang/slang-serialize-riff.cpp
@@ -144,22 +144,22 @@ void RIFFSerialWriter::_writeFloat(double value)
     }
 }
 
-void RIFFSerialWriter::beginArray()
+void RIFFSerialWriter::beginArray(Scope&)
 {
     _cursor.beginListChunk(RIFFSerial::kArrayFourCC);
 }
 
-void RIFFSerialWriter::endArray()
+void RIFFSerialWriter::endArray(Scope&)
 {
     _cursor.endChunk();
 }
 
-void RIFFSerialWriter::beginDictionary()
+void RIFFSerialWriter::beginDictionary(Scope&)
 {
     _cursor.beginListChunk(RIFFSerial::kDictionaryFourCC);
 }
 
-void RIFFSerialWriter::endDictionary()
+void RIFFSerialWriter::endDictionary(Scope&)
 {
     _cursor.endChunk();
 }
@@ -169,24 +169,24 @@ bool RIFFSerialWriter::hasElements()
     return false;
 }
 
-void RIFFSerialWriter::beginStruct()
+void RIFFSerialWriter::beginStruct(Scope&)
 {
     _cursor.beginListChunk(RIFFSerial::kStructFourCC);
 }
 
-void RIFFSerialWriter::endStruct()
+void RIFFSerialWriter::endStruct(Scope&)
 {
     _cursor.endChunk();
 }
 
-void RIFFSerialWriter::beginVariant()
+void RIFFSerialWriter::beginVariant(Scope& scope)
 {
-    beginStruct();
+    beginStruct(scope);
 }
 
-void RIFFSerialWriter::endVariant()
+void RIFFSerialWriter::endVariant(Scope& scope)
 {
-    endStruct();
+    endStruct(scope);
 }
 
 void RIFFSerialWriter::handleFieldKey(char const* name, Int index)
@@ -197,27 +197,27 @@ void RIFFSerialWriter::handleFieldKey(char const* name, Int index)
     SLANG_UNUSED(index);
 }
 
-void RIFFSerialWriter::beginTuple()
+void RIFFSerialWriter::beginTuple(Scope&)
 {
     _cursor.beginListChunk(RIFFSerial::kTupleFourCC);
 }
 
-void RIFFSerialWriter::endTuple()
+void RIFFSerialWriter::endTuple(Scope&)
 {
     _cursor.endChunk();
 }
 
-void RIFFSerialWriter::beginOptional()
+void RIFFSerialWriter::beginOptional(Scope&)
 {
     _cursor.beginListChunk(RIFFSerial::kOptionalFourCC);
 }
 
-void RIFFSerialWriter::endOptional()
+void RIFFSerialWriter::endOptional(Scope&)
 {
     _cursor.endChunk();
 }
 
-void RIFFSerialWriter::handleSharedPtr(void*& value, Callback callback, void* context)
+void RIFFSerialWriter::handleSharedPtr(void*& value, SerializerCallback callback, void* context)
 {
     // Because we are writing, we only care about the
     // pointer that is already present in `value`.
@@ -283,7 +283,7 @@ void RIFFSerialWriter::handleSharedPtr(void*& value, Callback callback, void* co
     _objects.add(objectInfo);
 }
 
-void RIFFSerialWriter::handleUniquePtr(void*& value, Callback callback, void* context)
+void RIFFSerialWriter::handleUniquePtr(void*& value, SerializerCallback callback, void* context)
 {
     // We treat all pointers as shared pointers, because there isn't really
     // an optimized representation we would want to use for the unique case.
@@ -293,7 +293,7 @@ void RIFFSerialWriter::handleUniquePtr(void*& value, Callback callback, void* co
 
 void RIFFSerialWriter::handleDeferredObjectContents(
     void* valuePtr,
-    Callback callback,
+    SerializerCallback callback,
     void* context)
 {
     // Because we are already deferring writing of the *entirety* of
@@ -485,23 +485,22 @@ void RIFFSerialReader::handleString(String& value)
     _advanceCursor();
 }
 
-void RIFFSerialReader::beginArray()
+void RIFFSerialReader::beginArray(Scope&)
 {
     _beginListChunk(RIFFSerial::kArrayFourCC);
 }
 
-void RIFFSerialReader::endArray()
+void RIFFSerialReader::endArray(Scope&)
 {
     _endListChunk();
 }
 
-
-void RIFFSerialReader::beginDictionary()
+void RIFFSerialReader::beginDictionary(Scope&)
 {
     _beginListChunk(RIFFSerial::kDictionaryFourCC);
 }
 
-void RIFFSerialReader::endDictionary()
+void RIFFSerialReader::endDictionary(Scope&)
 {
     _endListChunk();
 }
@@ -511,24 +510,24 @@ bool RIFFSerialReader::hasElements()
     return _cursor.get() != nullptr;
 }
 
-void RIFFSerialReader::beginStruct()
+void RIFFSerialReader::beginStruct(Scope&)
 {
     _beginListChunk(RIFFSerial::kStructFourCC);
 }
 
-void RIFFSerialReader::endStruct()
+void RIFFSerialReader::endStruct(Scope&)
 {
     _endListChunk();
 }
 
-void RIFFSerialReader::beginVariant()
+void RIFFSerialReader::beginVariant(Scope& scope)
 {
-    beginStruct();
+    beginStruct(scope);
 }
 
-void RIFFSerialReader::endVariant()
+void RIFFSerialReader::endVariant(Scope& scope)
 {
-    endStruct();
+    endStruct(scope);
 }
 
 void RIFFSerialReader::handleFieldKey(char const* name, Int index)
@@ -539,22 +538,22 @@ void RIFFSerialReader::handleFieldKey(char const* name, Int index)
     SLANG_UNUSED(index);
 }
 
-void RIFFSerialReader::beginTuple()
+void RIFFSerialReader::beginTuple(Scope&)
 {
     _beginListChunk(RIFFSerial::kTupleFourCC);
 }
 
-void RIFFSerialReader::endTuple()
+void RIFFSerialReader::endTuple(Scope&)
 {
     _endListChunk();
 }
 
-void RIFFSerialReader::beginOptional()
+void RIFFSerialReader::beginOptional(Scope&)
 {
     _beginListChunk(RIFFSerial::kOptionalFourCC);
 }
 
-void RIFFSerialReader::endOptional()
+void RIFFSerialReader::endOptional(Scope&)
 {
     _endListChunk();
 }
@@ -572,7 +571,7 @@ RIFFSerialReader::ObjectIndex RIFFSerialReader::_readObjectReference()
     return objectIndex;
 }
 
-void RIFFSerialReader::handleSharedPtr(void*& value, Callback callback, void* context)
+void RIFFSerialReader::handleSharedPtr(void*& value, SerializerCallback callback, void* context)
 {
     // The logic here largely mirrors what appears in
     // `RIFFSerialWriter::handleSharedPtr`.
@@ -695,7 +694,7 @@ void RIFFSerialReader::handleSharedPtr(void*& value, Callback callback, void* co
     value = objectInfo.ptr;
 }
 
-void RIFFSerialReader::handleUniquePtr(void*& value, Callback callback, void* userData)
+void RIFFSerialReader::handleUniquePtr(void*& value, SerializerCallback callback, void* userData)
 {
     // We treat all pointers as shared pointers, because there isn't really
     // an optimized representation we would want to use for the unique case.
@@ -705,7 +704,7 @@ void RIFFSerialReader::handleUniquePtr(void*& value, Callback callback, void* us
 
 void RIFFSerialReader::handleDeferredObjectContents(
     void* valuePtr,
-    Callback callback,
+    SerializerCallback callback,
     void* context)
 {
     // Unlike the case in `RIFFSerialWriter::handleDeferredObjectContents()`,