Changeset 245 for branches


Ignore:
Timestamp:
Jun 9, 2011 11:44:10 AM (7 years ago)
Author:
kulshres
Message:

Merge branch 'mpi' of 'gitclone' into svn-mpi

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

commit c585893d4b4eb01f4b43739e2d6a744a5f1b5450
Author: Kshitij Kulshreshtha <kshitij@…>
Date: Thu Jun 9 17:42:37 2011 +0200

Better linking with C

Signed-off-by: Kshitij Kulshreshtha <kshitij@…>

Location:
branches/MPI/ADOL-C/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/MPI/ADOL-C/src/adolc_mpi.cpp

    r241 r245  
    3939    return trace_on( this_tag );
    4040}
     41
     42BEGIN_C_DECLS
     43
    4144int ADOLC_MPI_Init( int* a,
    4245                    char*** b
     
    8992    }
    9093}
     94
     95END_C_DECLS
    9196
    9297int ADOLC_MPI_Send( adouble *buf,
  • branches/MPI/ADOL-C/src/adolc_mpi.h

    r241 r245  
    4747} ADOLC_MPI_Op;
    4848
    49 #ifdef __cplusplus
    50 extern "C" {
    51 #endif
     49BEGIN_C_DECLS
    5250
    5351int ADOLC_MPI_Init(int* a, char*** b);
     
    5957
    6058MPI_Op adolc_to_mpi_op(ADOLC_MPI_Op);
    61 #ifdef __cplusplus
    62 }
    63 #endif
     59
     60END_C_DECLS
     61
    6462extern int mpi_initialized;
    6563extern int process_count;
  • branches/MPI/ADOL-C/src/interfaces_mpi.cpp

    r240 r245  
    237237
    238238/*  for extern "C"           */
     239BEGIN_C_DECLS
    239240int zos_forward_p( int id,
    240241                 int size,
     
    364365    return indopro_forward_safe(id,size,tag,m,n,x,crs);
    365366}
     367END_C_DECLS
  • branches/MPI/ADOL-C/src/interfaces_mpi.h

    r240 r245  
    8383#endif /* __cplusplus */
    8484
    85 #ifdef __cpluplus
    86 extern "C" {
    87 #endif
    88 
     85BEGIN_C_DECLS
    8986int zos_forward_p(
    9087    int,int,short,int,int,int,const double*,double*);
     
    135132    int, int, short, int, int, double*, unsigned int**);
    136133
    137 #ifdef __cpluplus
    138 }
    139 #endif
    140 
     134END_C_DECLS
    141135
    142136#endif /*HAVE_MPI*/
Note: See TracChangeset for help on using the changeset viewer.