Changeset 617 for trunk/ADOL-C/include


Ignore:
Timestamp:
Aug 18, 2015 5:56:38 PM (4 years ago)
Author:
kulshres
Message:

rename malloc.{h,c} to rpl_malloc.{h,c}

otherwise this interferes with the system's own malloc.h
on windows atleast.

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

Location:
trunk/ADOL-C/include/adolc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ADOL-C/include/adolc/adouble.h

    r608 r617  
    2525/*                                                         THIS FILE IS C++ */
    2626#ifdef __cplusplus
    27 #if __cplusplus < 201103L
     27#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
     28#define COMPILER_HAS_CXX11
     29#else
    2830#error "please use -std=c++11 compiler flag with a C++11 compliant compiler"
    2931#endif
  • trunk/ADOL-C/include/adolc/adtl.h

    r605 r617  
    2323#include <stdexcept>
    2424
    25 #if __cplusplus < 201103L
     25#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
     26#define COMPILER_HAS_CXX11
     27#else
    2628#error "please use -std=c++11 compiler flag with a C++11 compliant compiler"
    2729#endif
  • trunk/ADOL-C/include/adolc/internal/common.h

    r542 r617  
    6363
    6464#       if defined(ADOLC_NO_MALLOC)
    65 #           include "malloc.h"
     65#           include "rpl_malloc.h"
    6666#           define malloc rpl_malloc
    6767#           define calloc rpl_calloc
    6868#       endif /* ADOLC_NO_MALLOC */
    6969#       if defined(ADOLC_NO_REALLOC)
    70 #           include "malloc.h"
     70#           include "rpl_malloc.h"
    7171#           define realloc rpl_realloc
    7272#       endif /* ADOLC_NO_REALLOC */
Note: See TracChangeset for help on using the changeset viewer.