Upgrade to Visual Studio 2015

This commit is contained in:
Zihan Chen
2016-10-03 00:07:28 -07:00
parent c1f4c64f51
commit 7670b918cd
68 changed files with 118 additions and 112 deletions
+4
View File
@@ -15695,7 +15695,11 @@ DescriptableObject
{
if (aggregationInfo[aggregationSize + 1] != nullptr)
{
#pragma warning (push)
#pragma warning (disable: 4297)
// Your class should call FinalizeAggregation in the destructor if it inherits from AggregatableDescription<T>.
CHECK_ERROR(!IsAggregated(), L"vl::reflection::DescriptableObject::~DescriptableObject0()#FinalizeAggregation function should be called.");
#pragma warning (pop)
}
}
for (vint i = 0; i < aggregationSize; i++)