[Scummvm-git-logs] scummvm master -> 135ac922aa8e886a6be244f5d52e483e5d7c0599

[csnover]

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:
135ac922aa COMMON: Define STATIC_ASSERT for all ports


Commit: 135ac922aa8e886a6be244f5d52e483e5d7c0599
    https://github.com/scummvm/scummvm/commit/135ac922aa8e886a6be244f5d52e483e5d7c0599
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-01-14T10:17:58-06:00

Commit Message:
COMMON: Define STATIC_ASSERT for all ports

Ports with -DNONSTANDARD_PORT need this too.

Changed paths:
    common/scummsys.h


diff --git a/common/scummsys.h b/common/scummsys.h
index 6fd9be8..27fcb84 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -151,7 +151,9 @@
 	#if !defined(__SYMBIAN32__)
 	#include <new>
 	#endif
+#endif
 
+#ifndef STATIC_ASSERT
 	/**
 	 * Generates a compile-time assertion.
 	 *