diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-18 14:15:51 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-18 14:15:51 +0400 |
| commit | b8272264965deeae711bc7e7d7a1f7aeeb449ec2 (patch) | |
| tree | e330b005dda498280e97b5e124e73eab648a7cf2 /src/thirdparty/VirtualDub | |
| parent | f4a6dd85b7bfbbac3f0c468102e27a99475c8672 (diff) | |
compilation works again with ICL
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3678 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/thirdparty/VirtualDub')
| -rw-r--r-- | src/thirdparty/VirtualDub/h/vd2/system/vdstl_vector.h | 2 | ||||
| -rw-r--r-- | src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/thirdparty/VirtualDub/h/vd2/system/vdstl_vector.h b/src/thirdparty/VirtualDub/h/vd2/system/vdstl_vector.h index 43e062df1..59416fbe7 100644 --- a/src/thirdparty/VirtualDub/h/vd2/system/vdstl_vector.h +++ b/src/thirdparty/VirtualDub/h/vd2/system/vdstl_vector.h @@ -146,6 +146,7 @@ vdvector<T,A>::vdvector(size_type n, const T& value, const A& a = A()) resize(n, value);
}
+#if !defined(__INTEL_COMPILER) // MPC-HC specific: ICC 12.0.5 gives an error
template <class T, class A>
template <class InputIterator>
vdvector<T,A>::vdvector(InputIterator first, InputIterator last, const A& a = A())
@@ -153,6 +154,7 @@ vdvector<T,A>::vdvector(InputIterator first, InputIterator last, const A& a = A( {
assign(first, last);
}
+#endif
template <class T, class A>
vdvector<T,A>::vdvector(const vdvector<T,A>& x)
diff --git a/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h b/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h index 0a5a63e50..b38e1461d 100644 --- a/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h +++ b/src/thirdparty/VirtualDub/h/vd2/system/vdtypes.h @@ -272,7 +272,7 @@ extern void VDDebugPrint(const char *format, ...); #endif
-#ifdef _DEBUG
+#if defined(_DEBUG) && !defined(__INTEL_COMPILER) // MPC-HC specific - Cannot use these macros with ICL
namespace {
template<int line>
|