diff --git a/performance.cpp b/performance.cpp index 659af91f..3102c52d 100644 --- a/performance.cpp +++ b/performance.cpp @@ -24,6 +24,11 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4244) +#endif + #include #include #include @@ -166,9 +171,6 @@ void test( std::string const & name, auto loadResult = loadData( os, {SerializationT::boost::template load} ); totalBoostLoad += loadResult.second; - - if( validateData ) - ; // TODO } // Cereal @@ -181,9 +183,6 @@ void test( std::string const & name, auto loadResult = loadData( os, {SerializationT::cereal::template load} ); totalCerealLoad += loadResult.second; - - if( validateData ) - ; // TODO } } @@ -241,7 +240,7 @@ std::basic_string random_basic_string(std::mt19937 & gen) { std::basic_string s(std::uniform_int_distribution(3, 30)(gen), ' '); for(C & c : s) - c = std::uniform_int_distribution(' ', '~')(gen); + c = static_cast( std::uniform_int_distribution( '~', '~' )(gen) ); return s; } @@ -390,7 +389,7 @@ int main() std::map m; for(size_t i=0; i(name.str(), m); }; @@ -402,3 +401,7 @@ int main() return 0; } + +#ifdef _MSC_VER +#pragma warning(pop) +#endif diff --git a/vs2013/performance/performance.vcxproj b/vs2013/performance/performance.vcxproj new file mode 100644 index 00000000..ec95d1c5 --- /dev/null +++ b/vs2013/performance/performance.vcxproj @@ -0,0 +1,79 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2F374733-FCA8-4CBB-91A0-2B0B34393D86} + performance + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + $(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath) + C:\Boost\lib;$(LibraryPath) + + + $(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath) + C:\Boost\lib;$(LibraryPath) + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + \ No newline at end of file diff --git a/vs2013/performance/performance.vcxproj.filters b/vs2013/performance/performance.vcxproj.filters new file mode 100644 index 00000000..1dfa88a6 --- /dev/null +++ b/vs2013/performance/performance.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/vs2013/vs2013.sln b/vs2013/vs2013.sln index 575874f3..6ba10b18 100644 --- a/vs2013/vs2013.sln +++ b/vs2013/vs2013.sln @@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_rtti", "sandbox_rtt EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "unittests\unittests.vcxproj", "{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance", "performance\performance.vcxproj", "{2F374733-FCA8-4CBB-91A0-2B0B34393D86}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -61,6 +63,12 @@ Global {D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release|Win32.Build.0 = Release|Win32 {D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release|x64.ActiveCfg = Release|x64 {D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release|x64.Build.0 = Release|x64 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug|Win32.ActiveCfg = Debug|Win32 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug|Win32.Build.0 = Debug|Win32 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug|x64.ActiveCfg = Debug|Win32 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release|Win32.ActiveCfg = Release|Win32 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release|Win32.Build.0 = Release|Win32 + {2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE