Skip to content

Make some headers more explicitly C++-only #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neboat merged 4 commits into from
Jan 26, 2026
Merged

Make some headers more explicitly C++-only #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8331a7f
Keyword renaming is not needed if __cilk >= 301
VoxSciurorum Jan 23, 2026
31adb1b
Rename holder.h to holder as a C++-only header
VoxSciurorum Jan 23, 2026
4f647c5
Rename opadd_reducer.h to opadd_reducer as a C++-only header
VoxSciurorum Jan 23, 2026
371ab33
Rename ostream_reducer.h to ostream_reducer as a C++-only header
VoxSciurorum Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ set(cilk_header_files
cilk/cilk.h
cilk/cilk_api.h
cilk/cilk_stub.h
cilk/holder.h
cilk/opadd_reducer.h
cilk/ostream_reducer.h
cilk/holder
cilk/opadd_reducer
cilk/ostream_reducer
cilk/reducer)

set(output_dir ${CHEETAH_OUTPUT_DIR}/include)
Expand Down
4 changes: 4 additions & 0 deletions include/cilk/cilk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#ifndef _CILK_H
#define _CILK_H

#if __cilk < 301

#define cilk_spawn _Cilk_spawn
#define cilk_sync _Cilk_sync
#define cilk_for _Cilk_for
#define cilk_scope _Cilk_scope

#define cilk_reducer _Hyperobject

#endif

#endif /* _CILK_H */
6 changes: 1 addition & 5 deletions include/cilk/holder.h → include/cilk/holder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef _HOLDER_H
#define _HOLDER_H

#ifdef __cplusplus

#include <type_traits>

namespace cilk {
Expand All @@ -16,10 +14,8 @@ template <typename A> static void reduce(void *left, void *right) {
}

template <typename A>
using holder = A _Hyperobject(init<A>, reduce<A>);
using holder = A cilk_reducer(init<A>, reduce<A>);

} // namespace cilk

#endif // __cplusplus

#endif // _HOLDER_H
6 changes: 1 addition & 5 deletions include/cilk/opadd_reducer.h → include/cilk/opadd_reducer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef _OPADD_REDUCER_H
#define _OPADD_REDUCER_H

#ifdef __cplusplus

namespace cilk {

template <typename T> static void zero(void *v) {
Expand All @@ -13,10 +11,8 @@ template <typename T> static void plus(void *l, void *r) {
*static_cast<T *>(l) += *static_cast<T *>(r);
}

template <typename T> using opadd_reducer = T _Hyperobject(zero<T>, plus<T>);
template <typename T> using opadd_reducer = T cilk_reducer(zero<T>, plus<T>);

} // namespace cilk

#endif // #ifdef __cplusplus

#endif // _OPADD_REDUCER_H
8 changes: 2 additions & 6 deletions include/cilk/ostream_reducer.h → include/cilk/ostream_reducer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#ifndef _OSTREAM_REDUCER_H
#define _OSTREAM_REDUCER_H

#ifdef __cplusplus

#include <ostream>
#include <sstream>

Expand Down Expand Up @@ -64,11 +62,9 @@ class ostream_view : public std::basic_ostream<Char, Traits>

template<typename Char, typename Traits = std::char_traits<Char>>
using ostream_reducer = ostream_view<Char, Traits>
_Hyperobject(&ostream_view<Char, std::char_traits<Char>>::identity,
&ostream_view<Char, std::char_traits<Char>>::reduce);
cilk_reducer(&ostream_view<Char, Traits>::identity,
&ostream_view<Char, Traits>::reduce);

} // namespace cilk

#endif // __cplusplus

#endif // _OSTREAM_REDUCER_H
Loading