From f6a6737b99df10195b706261c59e5a099a5a7910 Mon Sep 17 00:00:00 2001 From: selim Date: Thu, 11 Sep 2014 08:20:13 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/main.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/main.cpp b/test/main.cpp index fff551a..c63d5ac 100755 --- a/test/main.cpp +++ b/test/main.cpp @@ -565,7 +565,7 @@ void func(std::size_t n) { 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; @@ -573,10 +573,10 @@ 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; @@ -584,7 +584,6 @@ int main(int argc, char **argv) //ulog.log("Hello world!"); //ulog.log("some string: %", "qwe!"); - /* std::thread threads[threadsCount]; for(std::size_t i = 0; i < threadsCount; ++i) { @@ -595,7 +594,9 @@ int main(int argc, char **argv) for(std::size_t i = 0; i < threadsCount; ++i) threads[i].join(); + + int n = 0; + std::cin >> n; - return 0; - */ + return 0; }