Another Windows build fix - too much C++11 for MSVC 2012...

Change-Id: I2ae08bd7b850e26bd58d8cb9fad830edb0395259
Fix Windows build - the same thing in Writer.

Change-Id: Iba40d99dd6c162f20ca35e5a937b7c5ee3d2e126