Fixed #1159: Support Clang 3.4.2
Fixed #1161: Use HPX_ASSERT to aid the compiler
tabs --> spaces, cosmetics
Fix missing closing paren
patching up problems created by previous commits
More tweaking for the changed HPX_ASSERT
Fixing preprocessor logic
One more fix for gcc 4.7