lp:~armagetronad-dev/armagetronad/trunk-armagetronad-boostthread

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work at revision 1102

dlh: Approve on 2011-09-11

Diff: 1487 lines (+519/-454)

22 files modified

MacOS/Armagetron Advanced.xcodeproj/project.pbxproj (+12/-0)
acinclude.m4 (+0/-224)
configure.ac (+8/-9)
src/Makefile.am (+3/-0)
src/macosx/config_common.h (+3/-0)
src/macosx/dedicated/aa_config.h (+1/-0)
src/network/nAuthentication.cpp (+37/-64)
src/tools/pthread-binding.h (+0/-82)
src/tools/tError.cpp (+1/-1)
src/tools/tLockedQueue.h (+74/-0)
src/tools/tMemManager.cpp (+7/-31)
src/tools/tMutex.cpp (+82/-0)
src/tools/tMutex.h (+150/-0)
src/tools/tSafePTR.h (+8/-8)
src/tools/tThread.h (+105/-0)
src/tools/tToDo.cpp (+8/-23)
src/win32/config_common.h (+4/-0)
src/win32_ded/aa_config.h (+0/-1)
win32/code_blocks/ArmagetronAd.cbp (+5/-3)
win32/code_blocks/ArmagetronAd.workspace (+1/-2)
win32/code_blocks/Dedicated.cbp (+5/-3)
win32/code_blocks/Master.cbp (+5/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1078. By dlh on 2011-09-11

Enable authentication for Mac OS X dedicated servers

1077. By dlh on 2011-09-11

Use pthreads. Building the boost thread library as a universal binary supporting Mac OS X 10.4 is tricky...

1076. By dlh on 2011-09-11

Add new thread files to Mac OS X project.

1075. By Manuel Moos on 2011-08-25

Merging from mainline (empty merge, mainline had a bugfix for the old
system that has already been fixed here)

1074. By Manuel-moosnet on 2011-08-25

Executing the ZThread -> boost::thread switch on Windows.

1073. By Manuel-moosnet on 2011-08-25

Merging compilation fix from mainline.

1072. By Manuel-moosnet on 2011-08-25

Activating boost::thread on Windows.

1071. By Manuel Moos on 2011-08-24

Switched from ZThread to boost::thread as default preferred threading library; pthread still supported.

1070. By Manuel Moos on 2011-08-24

Erm, actually activating abort on error.

1069. By z-man on 2011-08-23

Merging branch 0.2.8 from revision 9715 to 9724:
 ------------------------------------------------------------------------
 r9724 | bazaaarmagetron | 2011-08-23 12:41:35 +0200 (Tue, 23 Aug 2011) | 2 lines

 Manuel Moos: Fixing the fast restart test and missing rebranding of serverstarter script.

 ------------------------------------------------------------------------
 r9723 | bazaaarmagetron | 2011-08-23 12:41:01 +0200 (Tue, 23 Aug 2011) | 2 lines

 Manuel Moos: Adding force-reload to comply with LSB.

 ------------------------------------------------------------------------
 r9722 | bazaaarmagetron | 2011-08-23 12:40:27 +0200 (Tue, 23 Aug 2011) | 2 lines

 Manuel Moos: Adding LSB information to starter scripts, shamelessly lifted from debian build rules (Original author: Christine Spang)

 ------------------------------------------------------------------------