Fixed Linux (GCC 6) build

grantila · Jan 8, 2017 · fb87e45 · fb87e45
1 parent 74c9d15
commit fb87e45
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,9 @@ else ( )
 	add_definitions( "-Wall" )
 	add_definitions( "-Wno-comment" )
 
-#        set( GENERIC_LIB_DEPS pthread dl )
+	if ( NOT APPLE )
+		set( GENERIC_LIB_DEPS pthread dl )
+	endif ( )
 endif ( )
 
 include_directories( "libs/q/include" )

diff --git a/build.sh b/build.sh
@@ -12,8 +12,8 @@ if [ "a$BUILDTYPE" == "a" ]; then
 fi
 
 if [ "$BUILDTYPE" == "Unix Makefiles" ]; then
-	mkdir -p obj
-	cd obj
+	mkdir -p build
+	cd build
 
 	# Create 4 different makefiles (each in a separate directory)
 	mkdir release;        cd release ;        cmake -G "$BUILDTYPE" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON  ../.. ; cd ..

diff --git a/libs/q/include/q/backlog.hpp b/libs/q/include/q/backlog.hpp
@@ -20,6 +20,8 @@
 #include <q/types.hpp>
 #include <q/type_traits.hpp>
 
+#include <limits>
+
 namespace q {
 
 class backlog

diff --git a/libs/q/include/q/concurrency.hpp b/libs/q/include/q/concurrency.hpp
@@ -20,6 +20,8 @@
 #include <q/types.hpp>
 #include <q/type_traits.hpp>
 
+#include <limits>
+
 namespace q {
 
 class concurrency

diff --git a/libs/q/include/q/queue.hpp b/libs/q/include/q/queue.hpp
@@ -37,38 +37,38 @@ struct timer_task
 	timer_task( const timer_task& ) = delete;
 
 	timer_task( task&& _task )
-	: task( std::move( _task ) )
+	: task_( std::move( _task ) )
 	, is_timed_( false )
 	{ }
 
 	timer_task( task&& _task, timer::point_type&& _wait_until )
-	: task( std::move( _task ) )
-	, wait_until( std::move( _wait_until ) )
+	: task_( std::move( _task ) )
+	, wait_until_( std::move( _wait_until ) )
 	, is_timed_( true )
 	{ }
 
 	bool operator!( ) const
 	{
-		return !this->task;
+		return !this->task_;
 	}
 
 	operator bool( ) const
 	{
-		return !!this->task;
+		return !!this->task_;
 	}
 
 	bool operator<( const timer_task& other ) const
 	{
-		return wait_until < other.wait_until;
+		return wait_until_ < other.wait_until_;
 	}
 
 	bool is_timed( ) const
 	{
 		return is_timed_;
 	}
 
-	task task;
-	timer::point_type wait_until;
+	task task_;
+	timer::point_type wait_until_;
 
 private:
 	bool is_timed_;

diff --git a/libs/q/src/blocking_dispatcher.cpp b/libs/q/src/blocking_dispatcher.cpp
@@ -96,16 +96,16 @@ void blocking_dispatcher::start( )
 			// We just add the timed task and re-iterate.
 			// This handling needs a complete overhaul. TODO
 			pimpl_->timer_tasks_.push(
-				std::move( _task.wait_until ),
-				std::move( _task.task ) );
+				std::move( _task.wait_until_ ),
+				std::move( _task.task_ ) );
 
 			continue;
 		}
 		else if ( _task )
 		{
 			Q_AUTO_UNIQUE_UNLOCK( lock );
 
-			_task.task( );
+			_task.task_( );
 		}
 
 		if ( pimpl_->running_ && !_task )

diff --git a/libs/q/src/thread.cpp b/libs/q/src/thread.cpp
@@ -85,7 +85,10 @@ void set_thread_name( const std::string& name )
 #elif defined( LIBQ_ON_BSD )
 	pthread_set_name_np( tid, name.c_str( ) );
 #else
-	pthread_setname_np( tid, name.c_str( ) );
+	if ( name.size( ) > 15 )
+		pthread_setname_np( tid, name.substr( 0, 15 ).c_str( ) );
+	else
+		pthread_setname_np( tid, name.c_str( ) );
 #endif
 
 #elif defined( LIBQ_ON_WINDOWS )

diff --git a/libs/q/src/threadpool.cpp b/libs/q/src/threadpool.cpp
@@ -190,16 +190,16 @@ promise< > threadpool::start( )
 					// highly inefficient and needs to be
 					// entirely redesigned. TODO
 					pimpl_->timer_tasks_.push(
-						std::move( _task.wait_until ),
-						std::move( _task.task ) );
+						std::move( _task.wait_until_ ),
+						std::move( _task.task_ ) );
 
 					continue;
 				}
 				else if ( _task )
 				{
 					Q_AUTO_UNIQUE_UNLOCK( lock );
 
-					invoker( std::move( _task.task ) );
+					invoker( std::move( _task.task_ ) );
 				}
 
 				if ( pimpl_->running_ && !_task )