selim/cpputil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправил вызов лога

Browse Source
This commit is contained in:
selim 2014-09-11 08:20:13 +04:00
parent 973d32f484
commit f6a6737b99
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/main.cpp
View File

@ -565,7 +565,7 @@ void func(std::size_t n)
{ {
for(std::size_t j = 0; j < 100; ++j) for(std::size_t j = 0; j < 100; ++j)
{ {
ulog.log("thread %, line %", n, j); ulog.log_info("thread %, line %", n, j);
} }
std::cout << "end of thread " << n << std::endl; std::cout << "end of thread " << n << std::endl;
@ -573,10 +573,10 @@ void func(std::size_t n)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
::testing::InitGoogleTest(&argc, argv); //::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); //return RUN_ALL_TESTS();
//const std::size_t threadsCount = 2; const std::size_t threadsCount = 2;
//int one = 1; //int one = 1;
//double two = 2.5; //double two = 2.5;
@ -584,7 +584,6 @@ int main(int argc, char **argv)
//ulog.log("Hello world!"); //ulog.log("Hello world!");
//ulog.log("some string: %", "qwe!"); //ulog.log("some string: %", "qwe!");
/*
std::thread threads[threadsCount]; std::thread threads[threadsCount];
for(std::size_t i = 0; i < threadsCount; ++i) for(std::size_t i = 0; i < threadsCount; ++i)
{ {
@ -596,6 +595,8 @@ int main(int argc, char **argv)
for(std::size_t i = 0; i < threadsCount; ++i) for(std::size_t i = 0; i < threadsCount; ++i)
threads[i].join(); threads[i].join();
int n = 0;
std::cin >> n;
return 0; return 0;
*/
} }