Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
CryEngine VS 2015 Update 3 compilation fix
diff --git a/Code/CryEngine/CryCommon/CryThreading/IJobManager_JobDelegator.h b/Code/CryEngine/CryCommon/CryThreading/IJobManager_JobDelegator.h
index 815a1df..e1ce244 100644
--- a/Code/CryEngine/CryCommon/CryThreading/IJobManager_JobDelegator.h
+++ b/Code/CryEngine/CryCommon/CryThreading/IJobManager_JobDelegator.h
@@ -59,8 +59,13 @@ private:
static False_ helper(...);
public:
+
#if CRY_PLATFORM_WINDOWS || CRY_PLATFORM_DURANGO // use a compiler intrinsic if available
+#if _MSC_FULL_VER >= 190024210 // on VS2015 Update 3 __is_convertible_to breaks most of our use-cases
+ enum { value = (std::is_convertible<T1, T2>::value || std::is_same<T1, T2>::value) };
+#else
enum { value = __is_convertible_to(T1, T2) };
+#endif
#else
enum { value = sizeof(True_) == sizeof(is_convertible::helper(*((T1*)(NULL)))) };
#endif
@afrostalin

This comment has been minimized.

Copy link

afrostalin commented Jul 7, 2016

Thx, it's work

@fancypantsorama

This comment has been minimized.

Copy link

fancypantsorama commented Aug 14, 2016

I cannot get Git am to apply the patch for some reason it fails. Can you help with this since this is exactly my issue. Maybe I extracted the download to the worng directory or something. I just recently started using Git and really am a complete Newbie to Git.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.