fixes to work with clang 3.4 and clang 3.3
Merge pull request #3585 from gartung/clang-34-comp

Static Analyzer -- Fixes to work with clang 3.4 and clang 3.3