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;
+ */
}