Tiger Wang
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D
3f23813412
Merge pull request #1647 from mc-server/SocketThreadsFix
...
Fixes socket leak in HTTP server.
2014-12-06 16:08:08 +01:00
Mattes D
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
Mattes D
44644ae025
Fixed reported parentheses around comparisons.
2014-12-05 12:58:47 +01:00
Mattes D
64f8428d03
Fixed trailing whitespace.
2014-12-04 22:07:04 +01:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
Mattes D
010546051e
Fixes socket leak in HTTP server.
...
Fixes #1643 .
2014-12-03 16:14:26 +01:00
Howaner
7049db5bf8
Fixed compiling on linux.
2014-11-30 14:23:51 +01:00
Mattes D
201313a9f8
Added a basic stacktracing for assert and signal failures.
2014-11-29 23:06:10 +01:00
Tiger Wang
6382989ba0
Compilation fixes
2014-11-23 14:22:05 +00:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
archshift
dd86c1f4a3
OSSupport/CMakeLists.txt: fixed indentation
2014-10-23 23:49:20 -07:00
Tiger Wang
51fa6b4090
Suggestions
2014-10-23 23:58:01 +01:00
archshift
8ccb729504
Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE.
2014-10-23 15:03:54 -07:00
archshift
6bcc2c187a
Fix linking on OS X, which does not have librt.
2014-10-23 14:58:42 -07:00
Mattes D
f8c54f4243
Merged branch 'master' into c++11.
2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Tiger Wang
2b920f9e21
Compile fix?
2014-10-21 13:49:53 +01:00
Tiger Wang
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
Tiger Wang
a324333c11
Use std::recusive_mutex
2014-10-20 21:26:18 +01:00
Tiger Wang
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
Tiger Wang
6d5a8892f3
Use std::thread
2014-10-19 00:29:34 +01:00
Steven Riehl
856764dee8
convert old style casts to fix warnings
2014-10-11 20:39:55 -06:00
worktycho
a20bd0dbbd
Update CMakeLists.txt
2014-10-05 23:44:55 +01:00
Mattes D
ec71ffcc80
Added a cEvent::Wait() with timeout.
2014-10-05 19:04:30 +02:00
Mattes D
c4a53c5d7d
OSSupport: Fixed UNICODE Windows builds.
...
The files now compile even inside UNICODE applications.
2014-09-14 01:33:05 +02:00
Mattes D
52a6b30f32
Merge remote-tracking branch 'origin/master' into CraftingFixes
2014-08-28 16:53:36 +03:00
Mattes D
49ac6fadfc
Fixed spaces after "template" keyword.
2014-08-28 16:44:36 +03:00
madmaxoft
1f4a1383c2
Removed an unneeded cast.
2014-08-15 07:19:13 +02:00
madmaxoft
10e58f04da
Fixed windows compilation and style issues.
2014-08-12 22:43:04 +02:00
Tycho
806d0936dc
First Implementatation of new Loggin framework
2014-08-10 19:34:11 +01:00
archshift
4191be7ddb
Removed redundant semicolons and re-added warning
2014-07-24 11:21:37 -07:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
archshift
1831c2e652
Socket: removed unused Socket destructor
2014-07-19 14:50:31 -07:00
madmaxoft
00c524519e
Fixed style: spaces after commas.
2014-07-19 14:53:41 +02:00
archshift
725d1fd1e2
Subdirs: Only add_library if not using MSVC
2014-07-18 17:41:43 -07:00
archshift
dcaa3262a2
OSSupport/CMakeLists.txt: Replaced glob with list of files
2014-07-18 17:41:43 -07:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
madmaxoft
7177806d31
Fixed printf formats for Win builds
2014-07-01 22:48:01 +02:00
madmaxoft
a5a0533d79
Fixed cFile compilation under MinGW.
2014-06-30 21:41:38 +02:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
28815252e6
Merge branch 'master' into SslWebAdmin
2014-05-10 21:27:57 +02:00
Mattes D
fb58ef55be
Fixed MSVC 64-bit build warnings.
2014-05-09 18:32:03 +02:00
madmaxoft
92c022c140
Open files in shared mode on windows, so that other tools may read them.
...
This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode.
2014-05-02 20:55:50 +02:00
madmaxoft
60850fe3e8
Fixed crashes in the SSL HTTP connection.
2014-05-01 15:08:15 +02:00
madmaxoft
58929a9948
Removed the unused cBlockingTCPLink class.
2014-04-30 17:06:46 +02:00
