Changeset 43c461d


Ignore:
Timestamp:
May 4, 2018, 5:43:48 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, with_gc
Children:
d7312ac
Parents:
c02f761 (diff), 4ea632e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

deal with conflict

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    rc02f761 r43c461d  
    267267
    268268                //Configure the conpilation (Output is not relevant)
    269                 //Use the current directory as the installation target so nothing
    270                 //escapes the sandbox
     269                //Use the current directory as the installation target so nothing escapes the sandbox
    271270                //Also specify the compiler by hand
    272271                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
  • src/Common/Heap.cc

    rc02f761 r43c461d  
    1010// Created On       : Thu May  3 16:16:10 2018
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri May  4 17:17:59 2018
    13 // Update Count     : 27
     12// Last Modified On : Fri May  4 17:27:31 2018
     13// Update Count     : 28
    1414//
    1515
     
    145145#endif // _GNU_SOURCE
    146146
    147                 error = dlerror();
    148                 if ( error ) {
    149                         std::cerr << "interpose_symbol : internal error, " << error << std::endl;
    150                         abort();
    151                 }
    152 
    153                 return fptr;
    154         }
    155 
    156147        extern "C" {
    157148                void * malloc( size_t size ) __attribute__((malloc));
Note: See TracChangeset for help on using the changeset viewer.