1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2026-07-09 01:57:09 +02:00

Prevent ambiguity errors during compilation caused by the new dispatch system under x64 builds.

This commit is contained in:
Sandu Liviu Catalin
2016-08-25 01:01:03 +03:00
parent d449247b5e
commit fae1e51c7b
11 changed files with 127 additions and 46 deletions
+11 -3
View File
@@ -42,7 +42,7 @@ struct Color3
/* --------------------------------------------------------------------------------------------
* Construct a color with all components with the same specified color.
*/
Color3(Value sv);
explicit Color3(Value sv);
/* --------------------------------------------------------------------------------------------
* Construct with individually specified red, green and blue colors.
@@ -372,7 +372,7 @@ struct Color3
/* --------------------------------------------------------------------------------------------
* Used by the script engine to compare an instance of this type with a scalar value.
*/
Int32 Cmp(Int32 s) const
Int32 Cmp(SQInteger s) const
{
return Cmp(Color3(static_cast< Value >(s)));
}
@@ -380,7 +380,15 @@ struct Color3
/* --------------------------------------------------------------------------------------------
* Used by the script engine to compare an instance of this type with a scalar value.
*/
Int32 Cmp(Float32 s) const
Int32 Cmp(SQFloat s) const
{
return Cmp(Color3(static_cast< Value >(s)));
}
/* --------------------------------------------------------------------------------------------
* Used by the script engine to compare an instance of this type with a scalar value.
*/
Int32 Cmp(bool s) const
{
return Cmp(Color3(static_cast< Value >(s)));
}