Merge branch 'master' of ssh://git.dyninst.org/pub/dyninst into Defensive
authorKevin Roundy <roundy@cs.wisc.edu>
Thu, 30 Jun 2011 15:32:30 +0000 (10:32 -0500)
committerKevin Roundy <roundy@cs.wisc.edu>
Thu, 30 Jun 2011 15:32:30 +0000 (10:32 -0500)
commite1e0d50f5023ab9755667f8ff3f24321a510cbd1
treeb665f0cf7017df2c30b28fcced8450c3f4127085
parent196e2da915c4d445ce19f4bf57ba53b66c9e69f3
parent0d44932bd15142a7893c502d1b1b09cb238b615c
Merge branch 'master' of ssh://git.dyninst.org/pub/dyninst into Defensive

Also fixes a number of compiler warnings, and re-instates
ParseCallback::absAddr, which should not have been deleted,
and removes ParseCallback::loadAddr which was unused and
redundant with absAddr.

Conflicts:
dyninstAPI/src/Parsing.h
patchAPI/src/PatchBlock.C
29 files changed:
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/MemoryEmulator/memEmulatorStub.h
dyninstAPI/src/Parsing.C
dyninstAPI/src/Parsing.h
dyninstAPI/src/addressSpace.C
dyninstAPI/src/function.C
dyninstAPI/src/function.h
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/src/instPoint.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/process.C
parseAPI/h/CodeObject.h
parseAPI/h/ParseCallback.h
parseAPI/src/CodeObject.C
parseAPI/src/ParseCallback.C
parseAPI/src/Parser.C
parseAPI/src/Parser.h
parseAPI/src/ParserDetails.C
patchAPI/h/PatchCFG.h
patchAPI/patchAPI.vcproj
patchAPI/src/PatchBlock.C
patchAPI/src/PatchEdge.C
patchAPI/src/PatchFunction.C
patchAPI/src/Point.C
symtabAPI/src/Symtab.C