[osquery:master] 1 new commit by Phil Christensen:

<https://github.com/facebook/osquery/commit/1c21fe42089fcc4cc2fa83e4cc0f04224867127a|1c21fe4>

C++ conformance fixes (MSVC /permissive-) (#2860) - Phil Christensen