Commit e8e454cf authored by David E. DeMarle's avatar David E. DeMarle

Merge branch 'fix-windows-compilation' into 'master'

fix windows compilation

This one snuck in during the recent big big merge.
With the if WIN32 code in the headers, we get errors like
C:\PROGRA~2\MICROS~2.0\VC\bin\cl.exe ....lots skipped.... \
/FoVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\XdmfHeavyDataDescription.cpp.obj \
/FdVTK\ThirdParty\xdmf3\vtkxdmf3\core\CMakeFiles\XdmfCoreObjects.dir\ \
/FS -c C:\bbd\1c569048\source-paraview\VTK\ThirdParty\xdmf3\vtkxdmf3\core\XdmfHeavyDataDescription.cpp
C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(658) : error C2562: 'boost::shared_ptr<Loki::BaseVisitor>::operator []' : 'void' function returning a value
        C:\bbd\1c569048\build\install\include\boost-1_56\boost/smart_ptr/shared_ptr.hpp(653) : see declaration of 'boost::shared_ptr<Loki::BaseVisitor>::operator []'

Really really need windows tests on the xdmf dashboard, and xdmf turned on in vtk buildbot.
This was only detected all the way up in ParaView pain.

See merge request !17
parents 86113671 98aaacae
...@@ -80,14 +80,6 @@ private: ...@@ -80,14 +80,6 @@ private:
std::string mPortDescription; std::string mPortDescription;
}; };
#ifdef _WIN32
XDMFCORE_TEMPLATE template class XDMFCORE_EXPORT
shared_ptr<Loki::BaseVisitor>;
XDMFCORE_TEMPLATE template class XDMFCORE_EXPORT
Loki::Visitor<shared_ptr<XdmfHeavyDataDescription>,
shared_ptr<XdmfItem> >;
#endif
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
......
Markdown is supported
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