[Scummvm-git-logs] scummvm master -> 75956ac9974dd256200f99edabb9fb603434a830

[dreammaster]

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

Summary:
1bfff86090 COMMON: Add replacement for isblank()
75956ac997 AGS: More RISC OS build fixes


Commit: 1bfff860901d26a9224f554e73992cb0d56b41e2
    https://github.com/scummvm/scummvm/commit/1bfff860901d26a9224f554e73992cb0d56b41e2
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-02-07T11:51:03-08:00

Commit Message:
COMMON: Add replacement for isblank()

Changed paths:
    common/forbidden.h
    common/util.cpp
    common/util.h
    engines/ags/shared/util/inifile.cpp


diff --git a/common/forbidden.h b/common/forbidden.h
index 4ea481d9e3..a702cfafe3 100644
--- a/common/forbidden.h
+++ b/common/forbidden.h
@@ -383,6 +383,11 @@
 	#define isxdigit(a)	FORBIDDEN_SYMBOL_REPLACEMENT
 	#endif
 
+	#ifndef FORBIDDEN_SYMBOL_EXCEPTION_isblank
+	#undef isblank
+	#define isblank(a)	FORBIDDEN_SYMBOL_REPLACEMENT
+	#endif
+
 #endif // FORBIDDEN_SYMBOL_EXCEPTION_ctype_h
 
 #ifndef FORBIDDEN_SYMBOL_EXCEPTION_mkdir
diff --git a/common/util.cpp b/common/util.cpp
index 4b7537f8ec..12dc3ee613 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -163,6 +163,10 @@ bool isGraph(int c) {
 	return isgraph((byte)c);
 }
 
+bool isBlank(int c) {
+	return c == ' ' || c == '\t';
+}
+
 
 #pragma mark -
 
diff --git a/common/util.h b/common/util.h
index 9b122cbb10..cc78100e87 100644
--- a/common/util.h
+++ b/common/util.h
@@ -286,6 +286,23 @@ bool isCntrl(int c);
  */
 bool isGraph(int c);
 
+/**
+ * Test whether the given character is blank.
+ *
+ * The following characters are considered blank:
+ * @code
+ * ' ', '\t'
+ * @endcode
+ *
+ * If the parameter is outside the range of a signed or unsigned char, then
+ * false is returned.
+ *
+ * @param c		The character to test.
+ *
+ * @return True if the character is blank, false otherwise.
+ */
+bool isBlank(int c);
+
 
 /**
  * Represent the size of a file in bytes as a number with floating point and
diff --git a/engines/ags/shared/util/inifile.cpp b/engines/ags/shared/util/inifile.cpp
index 4c75cd8cd0..23dfb25622 100644
--- a/engines/ags/shared/util/inifile.cpp
+++ b/engines/ags/shared/util/inifile.cpp
@@ -25,16 +25,9 @@
 #include "ags/shared/util/inifile.h"
 #include "ags/shared/util/textstreamreader.h"
 #include "ags/shared/util/textstreamwriter.h"
+#include "common/util.h"
 
 namespace AGS3 {
-
-// TODO: replace with C++11 std::isblank library function
-namespace agsstd {
-inline int isblank(int ch) {
-	return ch == ' ' || ch == '\t';
-}
-} // std
-
 namespace AGS {
 namespace Shared {
 
@@ -168,11 +161,11 @@ const char *SkipSpace(const char *line, const char *endl) {
 const char *ParsePaddedString(const char *line, const char *endl,
 	const char *&str_at, const char *&str_end) {
 	// skip left padding
-	for (; line != endl && agsstd::isblank(*line); ++line);
+	for (; line != endl && Common::isBlank(*line); ++line);
 	str_at = line;
 	// skip right padding
 	const char *p_value = line;
-	for (line = endl; line != p_value && agsstd::isblank(*(line - 1)); --line);
+	for (line = endl; line != p_value && Common::isBlank(*(line - 1)); --line);
 	str_end = line;
 	return line;
 }


Commit: 75956ac9974dd256200f99edabb9fb603434a830
    https://github.com/scummvm/scummvm/commit/75956ac9974dd256200f99edabb9fb603434a830
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-02-07T11:51:03-08:00

Commit Message:
AGS: More RISC OS build fixes

Changed paths:
    engines/ags/engine/util/library.h
    engines/ags/engine/util/mutex.h
    engines/ags/engine/util/mutex_std.h
    engines/ags/engine/util/thread.h
    engines/ags/shared/api/stream_api.h


diff --git a/engines/ags/engine/util/library.h b/engines/ags/engine/util/library.h
index 2fe01f2003..c91c62964d 100644
--- a/engines/ags/engine/util/library.h
+++ b/engines/ags/engine/util/library.h
@@ -32,9 +32,9 @@ namespace Engine {
 
 class BaseLibrary {
 public:
-	BaseLibrary() = default;
+	BaseLibrary() {}
 
-	virtual ~BaseLibrary() = default;
+	virtual ~BaseLibrary() {}
 
 	virtual AGS::Shared::String GetFilenameForLib(AGS::Shared::String libraryName) = 0;
 
diff --git a/engines/ags/engine/util/mutex.h b/engines/ags/engine/util/mutex.h
index 0b21a9a6f0..a9fd465371 100644
--- a/engines/ags/engine/util/mutex.h
+++ b/engines/ags/engine/util/mutex.h
@@ -29,9 +29,9 @@ namespace Engine {
 
 class BaseMutex {
 public:
-	BaseMutex() = default;
+	BaseMutex() {}
 
-	virtual ~BaseMutex() = default;
+	virtual ~BaseMutex() {}
 
 	BaseMutex &operator=(const BaseMutex &) = delete;
 	BaseMutex(const BaseMutex &) = delete;
diff --git a/engines/ags/engine/util/mutex_std.h b/engines/ags/engine/util/mutex_std.h
index 47c6209184..33161c3338 100644
--- a/engines/ags/engine/util/mutex_std.h
+++ b/engines/ags/engine/util/mutex_std.h
@@ -34,7 +34,7 @@ class StdMutex : public BaseMutex {
 public:
 	inline StdMutex() : mutex_() {
 	}
-	inline ~StdMutex() override = default;
+	inline ~StdMutex() override {}
 
 	StdMutex &operator=(const StdMutex &) = delete;
 	StdMutex(const StdMutex &) = delete;
diff --git a/engines/ags/engine/util/thread.h b/engines/ags/engine/util/thread.h
index 356122734e..e57cb48c4b 100644
--- a/engines/ags/engine/util/thread.h
+++ b/engines/ags/engine/util/thread.h
@@ -31,8 +31,8 @@ class BaseThread {
 public:
 	typedef void(*AGSThreadEntry)();
 
-	BaseThread() = default;
-	virtual ~BaseThread() = default;
+	BaseThread() {}
+	virtual ~BaseThread() {}
 
 	BaseThread &operator=(const BaseThread &) = delete;
 	BaseThread(const BaseThread &) = delete;
diff --git a/engines/ags/shared/api/stream_api.h b/engines/ags/shared/api/stream_api.h
index 682758f1d3..f410323c61 100644
--- a/engines/ags/shared/api/stream_api.h
+++ b/engines/ags/shared/api/stream_api.h
@@ -50,7 +50,7 @@ enum StreamSeek {
 
 class IAGSStream {
 public:
-	virtual ~IAGSStream() = default;
+	virtual ~IAGSStream() {}
 
 	virtual void        Close() = 0;