From e2ae2b7fc2204e1074981ce7590aaec78f150b6d Mon Sep 17 00:00:00 2001 From: selim Date: Sun, 7 Sep 2014 16:23:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D1=8B=20cpputil?= =?UTF-8?q?=20=D0=B8=20cpputil=5Ftest.=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BF=D1=80=D0=B5=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=BE=D0=B2=20=D0=B2=20=D1=84=D1=83=D0=BD=D0=BA?= =?UTF-8?q?=D1=86=D0=B8=D0=B8=20ucs4=5Fto=5Futf8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- msvc/cpputil.sln | 4 +++ msvc/cpputil/cpputil.vcxproj | 18 ++++++++++-- msvc/cpputil/cpputil.vcxproj.filters | 28 +++++++++++++++++++ msvc/cpputil_test/cpputil_test.vcxproj | 6 ++++ .../cpputil_test/cpputil_test.vcxproj.filters | 5 ++++ src/utf.cpp | 2 +- test/main.cpp | 9 ++++-- 7 files changed, 66 insertions(+), 6 deletions(-) diff --git a/msvc/cpputil.sln b/msvc/cpputil.sln index 4afc6c2..ff2244f 100644 --- a/msvc/cpputil.sln +++ b/msvc/cpputil.sln @@ -6,6 +6,10 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpputil", "cpputil\cpputil.vcxproj", "{734C1007-190E-4B4D-B01F-F947A3BF12AE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpputil_test", "cpputil_test\cpputil_test.vcxproj", "{BB753CD9-B6F2-4C75-BA38-D1255E748CE8}" + ProjectSection(ProjectDependencies) = postProject + {734C1007-190E-4B4D-B01F-F947A3BF12AE} = {734C1007-190E-4B4D-B01F-F947A3BF12AE} + {DC631418-E98C-4851-B178-ED0E1E0361F4} = {DC631418-E98C-4851-B178-ED0E1E0361F4} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest\gtest.vcxproj", "{DC631418-E98C-4851-B178-ED0E1E0361F4}" EndProject diff --git a/msvc/cpputil/cpputil.vcxproj b/msvc/cpputil/cpputil.vcxproj index 5291df6..bcf3baa 100644 --- a/msvc/cpputil/cpputil.vcxproj +++ b/msvc/cpputil/cpputil.vcxproj @@ -46,7 +46,8 @@ Level3 Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir)\..\src\asm\include;$(SolutionDir)\..\include;%(AdditionalIncludeDirectories) Windows @@ -61,7 +62,8 @@ MaxSpeed true true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir)\..\src\asm\include;$(SolutionDir)\..\include;%(AdditionalIncludeDirectories) Windows @@ -73,6 +75,18 @@ + + + + + + + + + + + + diff --git a/msvc/cpputil/cpputil.vcxproj.filters b/msvc/cpputil/cpputil.vcxproj.filters index 34c1b07..23af821 100644 --- a/msvc/cpputil/cpputil.vcxproj.filters +++ b/msvc/cpputil/cpputil.vcxproj.filters @@ -17,4 +17,32 @@ + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + \ No newline at end of file diff --git a/msvc/cpputil_test/cpputil_test.vcxproj b/msvc/cpputil_test/cpputil_test.vcxproj index f5b5b98..f4ff98b 100644 --- a/msvc/cpputil_test/cpputil_test.vcxproj +++ b/msvc/cpputil_test/cpputil_test.vcxproj @@ -52,10 +52,13 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\gtest\include;$(SolutionDir)\..\include;%(AdditionalIncludeDirectories) Console true + cpputil.lib;gtest.lib;%(AdditionalDependencies) + $(SolutionDir)\Debug;%(AdditionalLibraryDirectories) @@ -67,15 +70,18 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\gtest\include;$(SolutionDir)\..\include;%(AdditionalIncludeDirectories) Console true true true + cpputil.lib;gtest.lib;%(AdditionalDependencies) + diff --git a/msvc/cpputil_test/cpputil_test.vcxproj.filters b/msvc/cpputil_test/cpputil_test.vcxproj.filters index 6a1782f..fa690cb 100644 --- a/msvc/cpputil_test/cpputil_test.vcxproj.filters +++ b/msvc/cpputil_test/cpputil_test.vcxproj.filters @@ -14,4 +14,9 @@ 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/src/utf.cpp b/src/utf.cpp index 28d47ce..8abb246 100755 --- a/src/utf.cpp +++ b/src/utf.cpp @@ -249,7 +249,7 @@ void ucs4_to_utf8(const char32_t* src, char* dst, std::size_t symbols, bool need shiftLeft = UCS4_SYMBOL_BITS - sBits; shiftRight = pos*6; - *dst = static_cast((s << shiftLeft) >> (shiftLeft + shiftRight)) | utf8_first_byte_mask(totalBytes); + *dst = static_cast(((s << shiftLeft) >> (shiftLeft + shiftRight)) | utf8_first_byte_mask(totalBytes)); dst += totalBytes; } diff --git a/test/main.cpp b/test/main.cpp index c3d21f8..fff551a 100755 --- a/test/main.cpp +++ b/test/main.cpp @@ -573,16 +573,18 @@ void func(std::size_t n) int main(int argc, char **argv) { - //::testing::InitGoogleTest(&argc, argv); - //return RUN_ALL_TESTS(); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); - const std::size_t threadsCount = 2; + //const std::size_t threadsCount = 2; + //int one = 1; //double two = 2.5; //ulog.log("one: %, two: %", one, two); //ulog.log("Hello world!"); //ulog.log("some string: %", "qwe!"); + /* std::thread threads[threadsCount]; for(std::size_t i = 0; i < threadsCount; ++i) { @@ -595,4 +597,5 @@ int main(int argc, char **argv) threads[i].join(); return 0; + */ }