Build fixes

dyninst · Jan 30, 2017 · 8a9e684 · 8a9e684
1 parent ccfa426
commit 8a9e684
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/dyninstAPI/src/mapped_object.C b/dyninstAPI/src/mapped_object.C
@@ -380,7 +380,8 @@ mapped_module *mapped_object::findModule(pdmodule *pdmod)
    assert(pdmod);
 
    if (pdmod->imExec() != parse_img().get()) {
-      fprintf(stderr, "%s[%d]: WARNING: lookup for module in wrong mapped object! %p != %p\n", FILE__, __LINE__, pdmod->imExec(), parse_img());
+      fprintf(stderr, "%s[%d]: WARNING: lookup for module in wrong mapped object! %p != %p\n", FILE__, __LINE__,
+              pdmod->imExec(), parse_img().get());
       fprintf(stderr, "%s[%d]:  \t\t %s \n", FILE__, __LINE__, parse_img()->name().c_str());
       fprintf(stderr, "%s[%d]:  \t %s != \n", FILE__, __LINE__, pdmod->imExec()->name().c_str());
       return NULL;

diff --git a/parseAPI/h/CodeObject.h b/parseAPI/h/CodeObject.h
@@ -69,8 +69,9 @@ class CodeObject {
     PARSER_EXPORT static void version(int& major, int& minor, int& maintenance);
     typedef std::set<Function*,Function::less> funclist;
 
+    // Need to not export the templates as they're inlined
     template <typename CSPtr, typename FactPtr>
-    PARSER_EXPORT CodeObject(CSPtr cs,
+    CodeObject(CSPtr cs,
                              FactPtr fact,
                              ParseCallback * cb = NULL,
                              bool defensiveMode = false) :
@@ -81,7 +82,7 @@ class CodeObject {
         initialize(cb);
     }
     template <typename CSPtr>
-    PARSER_EXPORT CodeObject(CSPtr cs,
+    CodeObject(CSPtr cs,
                              void* dummy = NULL,
                              ParseCallback * cb = NULL,
                              bool defensiveMode = false) :