Skip to content

Dummy merge bugfix release 1.5.1

Vicente Bolea requested to merge vbolea/vtk-m:empty-merge-1.5.1 into master

This is an auxiliary branch which comes from the tip of master and do a -s ours merge to release_1.5.1.

We want this since we want to connect release_1.5.1 branch and its tag to master but we do not want any of its changes there.

This will look like this:

-Release1.5.1 _
               \
                \
                 \ vbolea/empty-merge
                / \
-------------------> Master 

Here is the commit message of the tip of release_1.5.1:


1.5.1 is a bugfix release for VTK-m.

  Add release notes for v1.5.1
  add Particle.h and Deprecated.h to the installed headers
  3b7b21c8 Do not use std::is_trivially_copyable on GCC 4.X
  7518d067 Try to fix uninitialized anonymous variable warning 5b18ffd7 Register Variant as trivially copyable if possible 16305bd8 Add tests of ArrayHandleMultiplexer on multiple devices
  07b55a95 Fix MSVC flags for CUDA builds.
  033dfe55 Only workaround incorrect GCC behavior for OpenMP on GCC
  870bd1d1 Removed unnecessary increment and decrement from ZFPDecode f9860b84 Correct warnings found by gcc-9 in vtkm::Particle
  83d4d4e4 ArrayPortalToIterators now compiles with GCC-4.X
  b36846e4 UnitTestVariant uses VTKM_USING_GLIBCXX_4 cbf20ac3 Merge branch 'upstream-diy' into aligned_union_check_handle_gcc_485 ac1a23be diy 2019-12-17 (bb86e1f7) 201e5c81 Add the gcc 4.8.5 release date to our VTKM_USING_GLIBCXX_4 check
  2e48d98d Merge branch 'upstream-diy' into update_check_for_aligned_union bbd5db31 diy 2019-12-16 (e365b66a) 269261b9 Handle compiling against 4.X versions of libstdc++
  b6b20f08 Use brigand integer sequences on icc.
  f89672b7 UnitTestFetchArrayTopologyMapIn now compiles with VS2015
  fb01d38a Disable deprecated attribute when using nvcc under VS
Edited by Vicente Bolea

Merge request reports

Loading