[Scummvm-git-logs] scummvm master -> 61a63f84006317b2ece155a0dd80f080b4d8069e

[csnover]

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

Summary:
87285ef609 SWORD25: Fix possible redefinition of FLT_EPSILON
6c40ceded1 TITANIC: Fix compilation failure in C++11 mode
61a63f8400 CREATE_PROJECT: Fix compilation failure in C++11 mode


Commit: 87285ef6093e1cf1dad738bef5bab25ae10be6d4
    https://github.com/scummvm/scummvm/commit/87285ef6093e1cf1dad738bef5bab25ae10be6d4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-17T22:47:59-06:00

Commit Message:
SWORD25: Fix possible redefinition of FLT_EPSILON

Changed paths:
    engines/sword25/fmv/movieplayer.cpp


diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index 62a897a3..c9e930e 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -43,7 +43,9 @@
 
 namespace Sword25 {
 
+#ifndef FLT_EPSILON
 #define FLT_EPSILON     1.192092896e-07F        /* smallest such that 1.0+FLT_EPSILON != 1.0 */
+#endif
 
 #ifdef USE_THEORADEC
 MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder() {


Commit: 6c40ceded18b918aa13780e216b89c205514275f
    https://github.com/scummvm/scummvm/commit/6c40ceded18b918aa13780e216b89c205514275f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-17T22:47:59-06:00

Commit Message:
TITANIC: Fix compilation failure in C++11 mode

Changed paths:
    engines/titanic/support/rect.h


diff --git a/engines/titanic/support/rect.h b/engines/titanic/support/rect.h
index eca256d..874dbda 100644
--- a/engines/titanic/support/rect.h
+++ b/engines/titanic/support/rect.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Returns the top/left corner of the rect as a point
 	 */
-	operator const Point() { return Point(left, top); }
+	operator Point() { return Point(left, top); }
 
 	/**
 	 * Clear the rect


Commit: 61a63f84006317b2ece155a0dd80f080b4d8069e
    https://github.com/scummvm/scummvm/commit/61a63f84006317b2ece155a0dd80f080b4d8069e
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-17T22:47:59-06:00

Commit Message:
CREATE_PROJECT: Fix compilation failure in C++11 mode

Getting the address of an rvalue is invalid, and not necessary
here.

Once C++11 can be used always, this utility function can just be
replaced with std::to_string.

Changed paths:
    devtools/create_project/create_project.cpp


diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 6715191..e59924c 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -1170,7 +1170,9 @@ bool producesObjectFile(const std::string &fileName) {
 }
 
 std::string toString(int num) {
-	return static_cast<std::ostringstream*>(&(std::ostringstream() << num))->str();
+	std::ostringstream os;
+	os << num;
+	return os.str();
 }
 
 /**