编译参数
Merge branch 'master' of github.com:dnizna/cppcode

Conflicts:
	pthread/CMakeLists.txt
mm