Fix compiler errors which occur after merging leak_detector client into ...

my workflow is the following:
1. `git checkout -b leak_detector origin/master`
2. copy leak_detector client code in origin/release into leak_detector branch
3. fix compiler errors,the changes can be seen by `git diff leak_detector:clients/watchpoints/clients/leak_detector/ origin/release:clients/watchpoints/clients/leak_detector/`

if there is something wrong, please finger out.