Merge conflicts, warnings, build issues; testsuite doesn't build
authorKevin Roundy <roundy@cs.wisc.edu>
Mon, 14 Feb 2011 17:41:35 +0000 (11:41 -0600)
committerKevin Roundy <roundy@cs.wisc.edu>
Mon, 14 Feb 2011 17:41:35 +0000 (11:41 -0600)
commit3173bd78e7d2940a051042b8552f8c1d72e23fbf
tree533cf3abffe448188c72c144a3e860ca41cd8a05
parent526944831725595974214eea2b8bad292b07d4e0
parentdb5de364b2956276caa35b973ac1c6ec2dae2a4d
Merge conflicts, warnings, build issues; testsuite doesn't build

- There were lots of conflicts in the merge with the last 70 commits
to HEAD.
- There were also lots of warnings, some in the Defensive
code, and some in Dyninst, that I fixed.
- The build issues were due to Windows-isms creeping into the
codebase.
- The testsuite doesn't build, but Drew was looking into that in
a separate commit

Merge branch 'master' of ssh://git.dyninst.org/pub/dyninst into Kevin-Drew

Conflicts:
dataflowAPI/h/SymEval.h
dataflowAPI/src/SymEval.C
dataflowAPI/src/slicing.C
dataflowAPI/src/stackanalysis.C
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/ast.C
dyninstAPI/src/function.C
parseAPI/src/IA_IAPI.h
parseAPI/src/ParseData.C
parseAPI/src/ParseData.h
parseAPI/src/Parser.C
parseAPI/src/ParserDetails.C
60 files changed:
Makefile
common/h/dwarfExpr.h
dataflowAPI/h/SymEval.h
dataflowAPI/h/stackanalysis.h
dataflowAPI/src/RoseInsnFactory.C
dataflowAPI/src/SymEval.C
dataflowAPI/src/SymEvalPolicy.C
dataflowAPI/src/debug_dataflow.C
dataflowAPI/src/slicing.C
dataflowAPI/src/stackanalysis.C
dyninstAPI/h/BPatch_addressSpace.h
dyninstAPI/h/BPatch_function.h
dyninstAPI/h/BPatch_image.h
dyninstAPI/h/BPatch_module.h
dyninstAPI/h/BPatch_point.h
dyninstAPI/h/BPatch_snippet.h
dyninstAPI/make.module.tmpl
dyninstAPI/src/BPatch_addressSpace.C
dyninstAPI/src/BPatch_asyncEventHandler.C
dyninstAPI/src/BPatch_function.C
dyninstAPI/src/BPatch_image.C
dyninstAPI/src/BPatch_module.C
dyninstAPI/src/BPatch_point.C
dyninstAPI/src/BPatch_process.C
dyninstAPI/src/BPatch_snippet.C
dyninstAPI/src/MemoryEmulator/memEmulator.C
dyninstAPI/src/Parsing.C
dyninstAPI/src/ast.C
dyninstAPI/src/ast.h
dyninstAPI/src/binaryEdit.C
dyninstAPI/src/block.C
dyninstAPI/src/callbacks.C
dyninstAPI/src/callbacks.h
dyninstAPI/src/codeRange.C
dyninstAPI/src/emit-x86.C
dyninstAPI/src/emit-x86.h
dyninstAPI/src/function.C
dyninstAPI/src/hybridCallbacks.C
dyninstAPI/src/hybridInstrumentation.C
dyninstAPI/src/inst-power.C
dyninstAPI/src/inst-x86.C
dyninstAPI/src/linux-x86.C
dyninstAPI/src/linux.C
dyninstAPI/src/mapped_object.C
dyninstAPI/src/process.C
dyninstAPI/src/process.h
dyninstAPI/src/symtab.C
parseAPI/h/CodeObject.h
parseAPI/src/CodeObject.C
parseAPI/src/IA_IAPI.C
parseAPI/src/IA_IAPI.h
parseAPI/src/IA_power.C
parseAPI/src/IA_x86.C
parseAPI/src/ParseData.C
parseAPI/src/ParseData.h
parseAPI/src/Parser.C
parseAPI/src/Parser.h
symtabAPI/src/Object-elf.C
testsuite/make.module.tmpl
testsuite/src/specification/spec-grouped.pl