Fix source files.

Author: hotwatermorning

008_thread/003_join.cpp

@@ -17,7 +17,6 @@ void print(T x) {
 }
 
 void foo() {
-  // 時間のかかる処理
   for (int i = 0; i < 3; ++i) {
     print(i);
   }

008_thread/004_detach.cpp

@@ -25,8 +25,7 @@ void bar() {
 } // bar()を抜けてもfooは別スレッドで実行中
 
 int main() {
-  std::promise<void> p;
-  waiter_ = p.get_future();
+  waiter_ = setter_.get_future();
 
   bar();
 

008_thread/005_get_id.cpp

@@ -10,19 +10,19 @@
 
 using namespace std;
 
-void foo(stringstream& ss) {
-  ss << "foo() : " << this_thread::get_id() << endl;
+void foo(ostringstream& os) {
+  os << "foo() : " << this_thread::get_id() << endl;
 }
 
-void bar(stringstream& ss) {
-  ss << "bar() : " << this_thread::get_id() << endl;
+void bar(ostringstream& os) {
+  os << "bar() : " << this_thread::get_id() << endl;
 }
 
 int main() {
-  stringstream ss_foo;
-  stringstream ss_bar;
-  thread th1(foo, ref(ss_foo));
-  thread th2(bar, ref(ss_bar));
+  ostringstream os_foo;
+  ostringstream os_bar;
+  thread th1(foo, ref(os_foo));
+  thread th2(bar, ref(os_bar));
 
   // それぞれのスレッドのIDを取得する
   thread::id id1 = th1.get_id();
@@ -36,7 +36,7 @@ int main() {
   th1.join();
   th2.join();
 
-  cout << ss_foo.str();
-  cout << ss_bar.str();
+  cout << os_foo.str();
+  cout << os_bar.str();
   cout << "main thread : " << this_thread::get_id() << endl;
 }

008_thread/008_hardware_concurrency.cpp

@@ -19,9 +19,9 @@ int main() {
             // 1スレッドだけ起動する
   }
 
-  vector<thread> ths;
-  for (size_t i = 0; i < mp; ++i) {
-    ths[i] = thread(worker);
+  vector<thread> ths(mp);
+  for (thread& th : ths) {
+    th = thread(worker);
   }
 
   for (thread& th : ths) {

008_thread/014_condition_variable.cpp

@@ -12,7 +12,7 @@ using namespace std;
 
 template <class T>
 struct LockedQueue {
-  LockedQueue(int capacity)
+  explicit LockedQueue(int capacity)
     :  capacity(capacity)
   {}
 

008_thread/016_01_async.cpp

@@ -13,7 +13,7 @@ using namespace std;
 
 int worker(const vector<int>& data) {
   int sum = 0;
-  for (auto i : data) {
+  for (int i : data) {
     //重たい処理
     this_thread::sleep_for(chrono::milliseconds(100));
     sum += i;

008_thread/016_02_packaged_task.cpp

@@ -14,7 +14,7 @@ using namespace std;
 
 int worker(const vector<int>& data) {
   int sum = 0;
-  for (int i : data) {
+  for (auto i : data) {
     //重たい処理
     this_thread::sleep_for(chrono::milliseconds(100));
     sum += i;

008_thread/017_thread_local.cpp

@@ -8,9 +8,6 @@
 #include <utility>
 #include <vector>
 
-// todo gcc 4.8で検証する
-#define thread_local __thread
-
 using namespace std;
 
 static mutex mtx;
@@ -25,9 +22,9 @@ void bar(size_t n) {
   tn += n;
   an += n;
 
-  cout << "static int : " << sn << endl;
-  cout << "thread_local int : " << tn << endl;
-  cout << "int : " << an << endl;
+  cout << "static int : " << sn << ", "
+       << "thread_local int : " << tn << ", "
+       << "int : " << an << endl;
   mtx.unlock();
 }
 
@@ -40,7 +37,7 @@ void foo() {
 int main() {
   vector<thread> ths;
 
-  for (size_t i = 0; i < 4; ++i) {
+  for (size_t i = 0; i < 2; ++i) {
     ths.push_back(thread(foo));
   }