commit 6e5e75fa21cba2c05f73d4d4e1c9cabba7de2da8
author James Zern <jzern@google.com> Thu May 08 14:32:32 2014 -0700
committer James Zern <jzern@google.com> Thu May 08 14:35:40 2014 -0700
tree 7187e3c34c5ca80f3c1ddb567d6b0356d2616314
parent 91344f0a36f83d73af1f5325be792235eb021802

Revert "Removing redundant variables from variance_test.cc."

This reverts commit 4725ab7e51a69bf890856e524c6d78aadd97d64e.

The constants are necessary to avoid breakage in vs9 builds:
 warning C4180: qualifier applied to function type has no meaning; ignored
 error C2436: 'f2_' : member function or nested class in constructor initializer list
 while compiling class template member function 'std::tr1::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>::tuple(const int &,const int &,unsigned int (__cdecl &))'
 ..\test\variance_test.cc : see reference to class template instantiation 'std::tr1::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>' being compiled

Change-Id: Ia218b74fc473d40f02fee84cb7009adfbe82e5a7