Changeset 43c461d

Timestamp:

May 4, 2018, 5:43:48 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, 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:

• Jenkinsfile (modified) (1 diff)
• src/Common/Heap.cc (modified) (2 diffs)

Jenkinsfile

@@ -267 +267 @@
 
                 //Configure the conpilation (Output is not relevant)
-                //Use the current directory as the installation target so nothing
-                //escapes the sandbox
+                //Use the current directory as the installation target so nothing escapes the sandbox
                 //Also specify the compiler by hand
                 sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"

src/Common/Heap.cc

@@ -10 +10 @@
 // Created On       : Thu May  3 16:16:10 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May  4 17:17:59 2018
-// Update Count     : 27
+// Last Modified On : Fri May  4 17:27:31 2018
+// Update Count     : 28
 //
 
@@ -145 +145 @@
 #endif // _GNU_SOURCE
 
-                error = dlerror();
-                if ( error ) {
-                        std::cerr << "interpose_symbol : internal error, " << error << std::endl;
-                        abort();
-                }
-
-                return fptr;
-        }
-
         extern "C" {
                 void * malloc( size_t size ) __attribute__((malloc));