Skip to content

Remove extra semicolons for pedantic compilers #20

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
patflick merged 1 commit into from
Aug 4, 2019
Merged

Remove extra semicolons for pedantic compilers #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Remove extra semicolons for pedantic compilers
  • Loading branch information
@mquevill
mquevill committed Aug 2, 2019
commit 68e11934025d57115ccf8b52fcda06dc6fdc413c
44 changes: 22 additions & 22 deletions include/mxx/datatypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,33 +252,33 @@ template <> class is_builtin_type<ctype> : public std::true_type {}; \
// MPI_Datatype
#define MXX_FOR_ALL_BUILTIN(BUILTIN_TYPE) \
/* char */ \
BUILTIN_TYPE(char, MPI_CHAR); \
BUILTIN_TYPE(unsigned char, MPI_UNSIGNED_CHAR); \
BUILTIN_TYPE(signed char, MPI_SIGNED_CHAR); \
BUILTIN_TYPE(char, MPI_CHAR) \
BUILTIN_TYPE(unsigned char, MPI_UNSIGNED_CHAR) \
BUILTIN_TYPE(signed char, MPI_SIGNED_CHAR) \
\
/* short */ \
BUILTIN_TYPE(unsigned short, MPI_UNSIGNED_SHORT); \
BUILTIN_TYPE(short, MPI_SHORT); \
BUILTIN_TYPE(unsigned short, MPI_UNSIGNED_SHORT) \
BUILTIN_TYPE(short, MPI_SHORT) \
\
/* int */ \
BUILTIN_TYPE(unsigned int, MPI_UNSIGNED); \
BUILTIN_TYPE(int, MPI_INT); \
BUILTIN_TYPE(unsigned int, MPI_UNSIGNED) \
BUILTIN_TYPE(int, MPI_INT) \
\
/* long */ \
BUILTIN_TYPE(unsigned long, MPI_UNSIGNED_LONG); \
BUILTIN_TYPE(long, MPI_LONG); \
BUILTIN_TYPE(unsigned long, MPI_UNSIGNED_LONG) \
BUILTIN_TYPE(long, MPI_LONG) \
\
/* long long */ \
BUILTIN_TYPE(unsigned long long, MPI_UNSIGNED_LONG_LONG); \
BUILTIN_TYPE(long long, MPI_LONG_LONG); \
BUILTIN_TYPE(unsigned long long, MPI_UNSIGNED_LONG_LONG) \
BUILTIN_TYPE(long long, MPI_LONG_LONG) \
\
/* floats */ \
BUILTIN_TYPE(float, MPI_FLOAT); \
BUILTIN_TYPE(double, MPI_DOUBLE); \
BUILTIN_TYPE(long double, MPI_LONG_DOUBLE); \
BUILTIN_TYPE(float, MPI_FLOAT) \
BUILTIN_TYPE(double, MPI_DOUBLE) \
BUILTIN_TYPE(long double, MPI_LONG_DOUBLE) \


MXX_FOR_ALL_BUILTIN(MXX_DATATYPE_MPI_BUILTIN);
MXX_FOR_ALL_BUILTIN(MXX_DATATYPE_MPI_BUILTIN)

#undef MXX_DATATYPE_MPI_BUILTIN

Expand All @@ -301,7 +301,7 @@ inline std::ostream& operator<<(std::ostream& os, const datatype_name& n) {
}

// define reverse mapping of datatypes for type decoding
#define MXX_INSERT_NAME_INTO_MAP(ctype, mpi_type) \
#define MXX_INSERT_NAME_INTO_MAP(ctype, mpi_type); \
m.emplace(mpi_type, datatype_name(#mpi_type, #ctype, typeid(ctype).name()))

class builtin_typename_map {
Expand Down Expand Up @@ -355,14 +355,14 @@ template <> struct datatype_pair<ctype> { \
template <> class is_builtin_pair_type<ctype> : public std::true_type {}; \

// integers-integer pairs
MXX_DATATYPE_BUILTIN_PAIR(short, MPI_SHORT_INT);
MXX_DATATYPE_BUILTIN_PAIR(int, MPI_2INT);
MXX_DATATYPE_BUILTIN_PAIR(long, MPI_LONG_INT);
MXX_DATATYPE_BUILTIN_PAIR(short, MPI_SHORT_INT)
MXX_DATATYPE_BUILTIN_PAIR(int, MPI_2INT)
MXX_DATATYPE_BUILTIN_PAIR(long, MPI_LONG_INT)

// floats
MXX_DATATYPE_BUILTIN_PAIR(float, MPI_FLOAT_INT);
MXX_DATATYPE_BUILTIN_PAIR(double, MPI_DOUBLE_INT);
MXX_DATATYPE_BUILTIN_PAIR(long double, MPI_LONG_DOUBLE_INT);
MXX_DATATYPE_BUILTIN_PAIR(float, MPI_FLOAT_INT)
MXX_DATATYPE_BUILTIN_PAIR(double, MPI_DOUBLE_INT)
MXX_DATATYPE_BUILTIN_PAIR(long double, MPI_LONG_DOUBLE_INT)


#undef MXX_DATATYPE_BUILTIN_PAIR
Expand Down
18 changes: 9 additions & 9 deletions include/mxx/reduction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ struct get_builtin_op<T, cpp_functor<T> > { \
} \
}; \

MXX_BUILTIN_OP(MPI_SUM, std::plus);
MXX_BUILTIN_OP(MPI_PROD, std::multiplies);
MXX_BUILTIN_OP(MPI_LAND, std::logical_and);
MXX_BUILTIN_OP(MPI_LOR, std::logical_or);
MXX_BUILTIN_OP(MPI_BOR, std::bit_or);
MXX_BUILTIN_OP(MPI_BXOR, std::bit_xor);
MXX_BUILTIN_OP(MPI_BAND, std::bit_and);
MXX_BUILTIN_OP(MPI_MAX, mxx::max);
MXX_BUILTIN_OP(MPI_MIN, mxx::min);
MXX_BUILTIN_OP(MPI_SUM, std::plus)
MXX_BUILTIN_OP(MPI_PROD, std::multiplies)
MXX_BUILTIN_OP(MPI_LAND, std::logical_and)
MXX_BUILTIN_OP(MPI_LOR, std::logical_or)
MXX_BUILTIN_OP(MPI_BOR, std::bit_or)
MXX_BUILTIN_OP(MPI_BXOR, std::bit_xor)
MXX_BUILTIN_OP(MPI_BAND, std::bit_and)
MXX_BUILTIN_OP(MPI_MAX, mxx::max)
MXX_BUILTIN_OP(MPI_MIN, mxx::min)

#undef MXX_BUILTIN_OP

Expand Down