[Scummvm-git-logs] scummvm master -> fa51502728703bb2f0bad8074110032273d771a3

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fa51502728 DIRECTOR: LINGO: Fix Compilation for AmigaOS4 and NDS Builds


Commit: fa51502728703bb2f0bad8074110032273d771a3
    https://github.com/scummvm/scummvm/commit/fa51502728703bb2f0bad8074110032273d771a3
Author: D G Turner (digitall at scummvm.org)
Date: 2020-06-15T20:02:40+01:00

Commit Message:
DIRECTOR: LINGO: Fix Compilation for AmigaOS4 and NDS Builds

The Datum(int32) constructor call was ambiguous on these platforms
due to the size difference with int, causing a compilation error.

Changed paths:
    engines/director/lingo/xlibs/fileio.cpp


diff --git a/engines/director/lingo/xlibs/fileio.cpp b/engines/director/lingo/xlibs/fileio.cpp
index 26b39de88f..724cf3e87f 100644
--- a/engines/director/lingo/xlibs/fileio.cpp
+++ b/engines/director/lingo/xlibs/fileio.cpp
@@ -329,9 +329,9 @@ void FileIO::m_getPosition(int nargs) {
 	FileObject *me = static_cast<FileObject *>(g_lingo->_currentMe.u.obj);
 
 	if (me->inStream) {
-		g_lingo->push(Datum(me->inStream->pos()));
+		g_lingo->push(Datum((int)me->inStream->pos()));
 	} else if (me->outStream) {
-		g_lingo->push(Datum(me->outStream->pos()));
+		g_lingo->push(Datum((int)me->outStream->pos()));
 	} else {
 		warning("FileIO: No file open");
 		g_lingo->push(Datum(kErrorFileNotOpen));
@@ -369,9 +369,9 @@ void FileIO::m_getLength(int nargs) {
 	FileObject *me = static_cast<FileObject *>(g_lingo->_currentMe.u.obj);
 
 	if (me->inStream) {
-		g_lingo->push(Datum(me->inStream->size()));
+		g_lingo->push(Datum((int)me->inStream->size()));
 	} else if (me->outStream) {
-		g_lingo->push(Datum(me->outStream->size()));
+		g_lingo->push(Datum((int)me->outStream->size()));
 	} else {
 		warning("FileIO: No file open");
 		g_lingo->push(Datum(kErrorFileNotOpen));