Changeset 470


Ignore:
Timestamp:
Feb 6, 2014 6:57:47 AM (7 years ago)
Author:
kulshres
Message:

Merge branch 'ampi'

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

The following commits were merged:

commit 618e331ee712d5c661da4839316817f478f22614
Author: Jean Utke <utke@…>
Date: Fri Jan 24 16:45:13 2014 -0600

enum renamed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/src/ampisupport.cpp

    r439 r470  
    440440}
    441441
    442 void ADTOOL_AMPI_push_CallCode(enum AMPI_PairedWith_E thisCall) {
     442void ADTOOL_AMPI_push_CallCode(enum AMPI_CallCode_E thisCall) {
    443443  if (ADOLC_CURRENT_TAPE_INFOS.traceFlag) {
    444444    switch(thisCall) {
     
    495495}
    496496
    497 void ADTOOL_AMPI_pop_CallCode(enum AMPI_PairedWith_E *thisCall) {
     497void ADTOOL_AMPI_pop_CallCode(enum AMPI_CallCode_E *thisCall) {
    498498  assert(0);
    499499}
Note: See TracChangeset for help on using the changeset viewer.