conformed to cpplint
Merge branch 'develop' of github.com:sgss/cxx-sgss-opaque into develop