Commit Graph

33 Commits

Author SHA1 Message Date
Vicente Adolfo Bolea Sanchez
188e5080bd Merge branch 'upstream-diy' into update-diy
# By Diy Upstream
* upstream-diy:
  diy 2023-06-16 (3ee23f39)
2023-06-19 20:07:20 -04:00
Vicente Adolfo Bolea Sanchez
662f93e07a Merge branch 'upstream-diy' into add-gpu-to-gpu-conn
# By Diy Upstream
* upstream-diy:
  diy 2023-03-28 (6837fb55)
2023-05-30 12:12:48 -04:00
Ryan Krattiger
4c708ac661 Merge branch 'upstream-diy' into fix_gcc11_crusher_build_error
# By Diy Upstream
* upstream-diy:
  diy 2022-09-14 (496253d7)
2022-09-23 13:10:01 -05:00
Vicente Adolfo Bolea Sanchez
9c267d1770 Merge branch 'upstream-diy' into add-update-diy
# By Diy Upstream
* upstream-diy:
  diy 2021-05-26 (b21d798e)
2021-06-01 10:33:30 -04:00
Vicente Adolfo Bolea Sanchez
ff84915bc3 Merge branch 'upstream-diy' into fix-use-c++14-in-every-target
# By Diy Upstream
* upstream-diy:
  diy 2021-04-12 (bc7dcda5)
2021-04-12 13:45:01 -04:00
Robert Maynard
913787f3a8 Merge branch 'upstream-diy' into update_thirdparty_for_hip_support
* upstream-diy:
  diy 2020-10-26 (538957e7)
2020-10-26 17:20:25 -04:00
Ben Boeckel
a4b4b1a2c9 Merge branch 'upstream-diy' into HEAD
# By Diy Upstream
* upstream-diy:
  diy 2020-08-26 (c9efaac9)
2020-08-26 14:18:31 -04:00
Sujin Philip
c35323ae42 Merge branch 'upstream-diy' into update-to-latest-diy
* upstream-diy:
  diy 2020-07-15 (4ea1241e)
2020-07-15 15:36:03 -05:00
Robert Maynard
749a110cd0 Merge branch 'upstream-diy' into update_diy_to_always_build_with_pic
* upstream-diy:
  diy 2020-07-01 (b0623438)
2020-07-01 10:48:43 -04:00
Robert Maynard
a1680ef8bf Merge branch 'upstream-diy' into update_diy_to_namespace_DEBUG_define
* upstream-diy:
  diy 2020-06-24 (ab765e66)
2020-07-01 08:28:17 -04:00
Sujin Philip
f0a37ac6aa Merge branch 'upstream-diy' into diy-mpi-nompi
* upstream-diy:
  diy 2020-06-05 (b62915aa)
2020-06-08 15:55:58 -05:00
Robert Maynard
cbf20ac3bb Merge branch 'upstream-diy' into aligned_union_check_handle_gcc_485
* upstream-diy:
  diy 2019-12-17 (bb86e1f7)
2019-12-17 10:19:43 -05:00
Robert Maynard
2e48d98d94 Merge branch 'upstream-diy' into update_check_for_aligned_union
* upstream-diy:
  diy 2019-12-16 (e365b66a)
2019-12-16 09:49:30 -05:00
Sujin Philip
8d9991cd71 Merge branch 'upstream-diy' into update-diy
* upstream-diy:
  diy 2019-08-22 (2153469e)
2019-08-22 14:04:20 -04:00
Sujin Philip
c0b497cc83 diy: remove in order to reset the import 2019-08-22 14:04:03 -04:00
Diy Upstream
a4d07730cc diy 2019-08-20 (166f7d1b)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 166f7d1bf6b4940b9edd3f91c78acf8ea6aa5bca (for/vtk-m).
2019-08-21 09:16:05 -04:00
Robert Maynard
b8f5d582d6 Merge branch 'upstream-diy' into support_clang-cl
* upstream-diy:
  diy 2019-05-14 (41fd7af6)
2019-05-14 11:47:02 -04:00
Diy Upstream
dbd3781d5c diy 2019-04-09 (f7a68da4)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit f7a68da4fbe93ae7a8699b66f125a98ace842998 (for/vtk-m).
2019-04-09 11:42:54 -04:00
Robert Maynard
5cc0d03f64 Merge branch 'upstream-diy' into clang_warnings
* upstream-diy:
  diy 2019-04-09 (f7a68da4)
2019-04-09 11:42:54 -04:00
Diy Upstream
ed4374b05d diy 2019-03-13 (e8e68c7c)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit e8e68c7cd2f362e706f11542a3408baa039de5e8 (for/vtk-m).
2019-03-26 14:53:42 -04:00
Robert Maynard
7d307b96ce Merge branch 'upstream-diy' into diy_conditional_serialization
* upstream-diy:
  diy 2019-02-08 (72a201e1)
2019-02-08 14:25:51 -05:00
Robert Maynard
2812842984 Merge branch 'upstream-diy' into correct_more_diy2_warnings
* upstream-diy:
  diy 2019-01-09 (149953b0)
2019-01-09 11:04:01 -05:00
Robert Maynard
5fa086f7d4 Merge branch 'upstream-diy' into fix_diy2_unused_call_result_warning
* upstream-diy:
  diy 2019-01-08 (839fd11e)
2019-01-08 12:35:31 -05:00
luz.paz
d5beb69ec1 Misc. typos
Found via `codespell`
2018-10-04 10:30:33 -04:00
Haocheng LIU
2f57470a13 Merge branch 'upstream-diy' into update-diy
* upstream-diy:
  diy 2018-07-09 (38da7b11)
2018-07-10 13:52:20 -04:00
Allison Vacanti
93506d25e2 Change function signatures to use 'using' aliases.
Also cleaned up some lingering type typedefs.
2018-05-25 17:18:41 -04:00
Robert Maynard
03ce61f299 Merge branch 'upstream-diy' into correct_clang_6_warnings
* upstream-diy:
  diy 2018-05-02 (a2fdc50d)
2018-05-02 14:28:46 -04:00
Utkarsh Ayachit
66fcf2a7fd Merge branch 'upstream-diy' into fix-diy-warnings
* upstream-diy:
  diy 2018-03-10 (08f19c67)
2018-03-10 09:24:19 -05:00
Robert Maynard
496ebb9628 Merge branch 'upstream-diy' into allow_diy_to_build_on_powerpc_clang
* upstream-diy:
  diy 2018-03-06 (56d516fd)
2018-03-06 14:56:05 -05:00
Utkarsh Ayachit
7f52fcd18b Merge branch 'upstream-diy' into make-diy-non-optional
* upstream-diy:
  diy 2018-02-27 (e140ad94)
2018-02-27 12:25:56 -05:00
Utkarsh Ayachit
61e28ae1cb Merge branch 'upstream-diy' into update_diy
* upstream-diy:
  diy 2018-02-15 (3c908c14)
2018-02-21 13:16:12 -05:00
luz.paz
80b11afa24 Misc. typos
Found via `codespell -q 3` via downstream VTK
2018-01-30 06:51:47 -05:00
Utkarsh Ayachit
a610329bb2 Merge branch 'upstream-diy' into diy-as-3rd-party
* upstream-diy:
  diy 2018-01-02 (aa778e24)
2018-01-03 14:06:35 -05:00