Browse Source

Merge branch 'v0.13'

Paul-Louis Ageneau 4 years ago
parent
commit
8dddf1290a
2 changed files with 2 additions and 8 deletions
  1. 1 1
      CMakeLists.txt
  2. 1 7
      src/impl/threadpool.cpp

+ 1 - 1
CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.7)
 project(libdatachannel
-	VERSION 0.13.3
+	VERSION 0.13.4
 	LANGUAGES CXX)
 set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")
 

+ 1 - 7
src/impl/threadpool.cpp

@@ -20,12 +20,6 @@
 
 #include <cstdlib>
 
-namespace {
-
-void joinThreadPoolInstance() { rtc::impl::ThreadPool::Instance().join(); }
-
-} // namespace
-
 namespace rtc::impl {
 
 ThreadPool &ThreadPool::Instance() {
@@ -33,7 +27,7 @@ ThreadPool &ThreadPool::Instance() {
 	return *instance;
 }
 
-ThreadPool::ThreadPool() { std::atexit(joinThreadPoolInstance); }
+ThreadPool::ThreadPool() {}
 
 ThreadPool::~ThreadPool() {}