Commit 1f74f316 authored by PRUVOST Florent's avatar PRUVOST Florent

Merge branch 'fix_cpp_operator' into 'master'

avoid to use operator as a variable because it is cxx reserved keyword (API problem)

See merge request solverstack/chameleon!132
parents a4a509da 896615d9
......@@ -56,11 +56,11 @@
*/
int CHAMELEON_map_Tile( cham_uplo_t uplo,
CHAM_desc_t *A,
cham_unary_operator_t operator,
cham_unary_operator_t op_fct,
void *op_args );
int CHAMELEON_map_Tile_Async( cham_uplo_t uplo,
CHAM_desc_t *A,
cham_unary_operator_t operator,
cham_unary_operator_t op_fct,
void *op_args,
RUNTIME_sequence_t *sequence,
RUNTIME_request_t *request );
......
......@@ -97,7 +97,7 @@ typedef int (*cham_unary_operator_t)( const CHAM_desc_t *desc,
void INSERT_TASK_map( const RUNTIME_option_t *options,
cham_uplo_t uplo, const CHAM_desc_t *A, int Am, int An,
cham_unary_operator_t operator, void *op_args );
cham_unary_operator_t op_fct, void *op_args );
#include "chameleon/tasks_z.h"
#include "chameleon/tasks_d.h"
......
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