Commit 3ed2c592 authored by Igor Okulist's avatar Igor Okulist Committed by David Gobbi
Browse files

COMP: Enable support for VS2011.

* Add missing include
* Allow usage of C++11 std::make_pair in case of vtkVariant see [1]

[1] http://connect.microsoft.com/VisualStudio/feedback/details/465859/make-pair-generates-c2264

Change-Id: I68f56bf6dc4ba3c11101a76e67d12ad3d8ccddd2
parent be64234e
......@@ -32,6 +32,7 @@
#include "vtkTable.h"
#include <vtksys/stl/map>
#include <vtksys/stl/functional>
// ----------------------------------------------------------------------
......
......@@ -89,7 +89,7 @@ void vtkMapArrayValues::AddToMap(char *from, char *to)
void vtkMapArrayValues::AddToMap(vtkVariant from, vtkVariant to)
{
this->Map->insert(vtkstd::make_pair< vtkVariant, vtkVariant >(from, to));
this->Map->insert(vtkstd::make_pair(from, to));
this->Modified();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment