Fixes compile error and Merge branch 'Defensive' of ssh://coriander.cs.wisc.edu/u...
authorKevin Roundy <roundy@cs.wisc.edu>
Mon, 9 Jan 2012 22:19:00 +0000 (16:19 -0600)
committerKevin Roundy <roundy@cs.wisc.edu>
Mon, 9 Jan 2012 22:19:00 +0000 (16:19 -0600)
commit9ee76bda685eff28709a66106e6cd433bdc526ee
tree594b1971cf433d9d63d1591aba35e52ccc159169
parent4c19d600ece62c6b3ed35a140545a6a2d6417503
parent06eb6eafaaf3245bb8bdf0cc896df54053aa78c3
Fixes compile error and Merge branch 'Defensive' of ssh://coriander.cs.wisc.edu/u/r/o/roundy/devel/g0/dyninst into Defensive

Conflicts:
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/block.C
patchAPI/make.module.tmpl
12 files changed:
common/src/dyn_regs.C
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/addressSpace.C
dyninstAPI/src/ast.C
dyninstAPI/src/block.C
dyninstAPI/src/inst-x86.C
patchAPI/h/CFGMaker.h
patchAPI/h/PatchCFG.h
patchAPI/src/PatchBlock.C