1 files changed, 15 insertions, 6 deletions
diff --git a/source/slang/diagnostics.cpp b/source/slang/diagnostics.cpp
index 4edea57a2..a947e7369 100644
--- a/source/slang/diagnostics.cpp
+++ b/source/slang/diagnostics.cpp
@@ -23,15 +23,24 @@ void printDiagnosticArg(StringBuilder& sb, char const* str)
     sb << str;
 }
 
-void printDiagnosticArg(StringBuilder& sb, int str)
+void printDiagnosticArg(StringBuilder& sb, int32_t val)
 {
-    sb << str;
+    sb << val;
+}
+
+void printDiagnosticArg(StringBuilder& sb, uint32_t val)
+{
+    sb << val;
+}
+
+void printDiagnosticArg(StringBuilder& sb, int64_t val)
+{
+    sb << val;
 }
 
-void printDiagnosticArg(StringBuilder& sb, UInt val)
+void printDiagnosticArg(StringBuilder& sb, uint64_t val)
 {
-    // TODO: make this robust
-    sb << (int) val;
+    sb << val;
 }
 
 void printDiagnosticArg(StringBuilder& sb, Slang::String const& str)
@@ -278,7 +287,7 @@ void DiagnosticSink::diagnoseImpl(SourceLoc const& pos, DiagnosticInfo const& in
         StringBuilder messageBuilder;
         formatDiagnostic(this, diagnostic, messageBuilder);
 
-        writer->write(messageBuilder.Buffer(), messageBuilder.Length());
+        writer->write(messageBuilder.getBuffer(), messageBuilder.getLength());
     }
     else
     {