dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,669 Commits 1 Branch 0 Tags
290471c70f63cd46ee314e59dcbbcc142c292d16
Commit Graph

203 Commits

Author SHA1 Message Date
Jonathan G Rennison
91e08c6cea Merge branch 'cpp-btree' into jgrpp 2018-11-01 18:56:02 +00:00
Jonathan G Rennison
7690fe8572 cpp-btree: Update to match upstream 
minor optimization: minimize calls to end()

Minor optimization: increase the chances that the compiler will inline calls to end().
Has been observed to make a difference with gcc 4.9.3.

Fix build and warnings on MSVC (2017)
Uses static_assert, a C++11 feature. Also adds some explicit uses of
static_cast in order to suppress warnings about lossy type conversion.
 2018-11-01 18:54:24 +00:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
Charles Pigott
5f86e1a390 Codechange: Silence -Wclass-memaccess warnings with GCC8 2018-06-27 22:54:46 +02:00
Jonathan G Rennison
4d1bd8e4b4 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/music.cpp
#	src/table/settings.ini
#	src/town_cmd.cpp
#	src/train_cmd.cpp
 2018-06-25 18:57:48 +01:00
Niels Martin Hansen
836d25e738 Codechange: Address some MSVC compiler warnings 2018-06-15 22:36:55 +02:00
Jonathan G Rennison
8353a4d095 Merge branch 'cpp-btree' into jgrpp 2018-05-06 12:16:52 +01:00
Jonathan G Rennison
133ccabf42 btree: Use static_assert instead of workaround macro 2018-05-06 12:15:54 +01:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
frosch
3bedb43de4 (svn r27896) -Fix: some warnings 2017-08-20 21:04:21 +00:00
frosch
062c736437 (svn r27896) -Fix: some warnings 2017-08-20 21:04:21 +00:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
344f39196f cpp-btree: Remove remaining uses of ssize_t 
This is due to issues building on Windows
 2017-02-28 21:23:52 +00:00
Jonathan G Rennison
418e9f4158 Remove assert.h include from btree.h, as this overrides OpenTTD's assert 2017-02-19 13:55:31 +00:00
Jonathan G Rennison
b4cfb1adbc Import cpp-btree library into 3rdparty section. 
Repo: https://github.com/JGRennison/cpp-btree
Commmit: 6cabdb40fcbb7e12e6d499f92b898f6ec80ae0f1

Remove test program, build scripts, etc.
 2017-02-07 19:07:11 +00:00
rubidium
dd5e3d9f33 (svn r27605) -Fix: GCC 6 warning about misleading indentation 2016-06-27 17:52:30 +00:00
rubidium
ac6312d33c (svn r27605) -Fix: GCC 6 warning about misleading indentation 2016-06-27 17:52:30 +00:00
matthijs
7e06cdb455 (svn r27561) -Fix [Squirrel]: Fix typos in error messages 2016-05-11 21:28:39 +00:00
matthijs
576005b714 (svn r27561) -Fix [Squirrel]: Fix typos in error messages 2016-05-11 21:28:39 +00:00
rubidium
809161ebf2 (svn r27289) -Fix: some uninitialised instance variables 2015-05-20 18:17:50 +00:00
rubidium
d05ac99d52 (svn r27289) -Fix: some uninitialised instance variables 2015-05-20 18:17:50 +00:00
rubidium
e700bc1e04 (svn r27233) -Fix [FS#6272]: crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer 2015-04-11 19:33:36 +00:00
rubidium
5ed8ac8a81 (svn r27233) -Fix [FS#6272]: crash when no AIs were installed due to improper handling of non-ASCII characters by the string pointer lexer 2015-04-11 19:33:36 +00:00
frosch
93fb724f87 (svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles) 2014-12-24 17:17:18 +00:00
frosch
396dde1636 (svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles) 2014-12-24 17:17:18 +00:00
rubidium
660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium
771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 2014-10-12 18:41:53 +00:00
rubidium
6a1ed21342 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 2014-09-19 20:06:51 +00:00
rubidium
79ca66eb67 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 2014-09-19 20:06:51 +00:00
rubidium
e87572d103 (svn r26845) -Fix [Squirrel]: more uninitialized variables in constructors 2014-09-17 18:35:45 +00:00
rubidium
dba98e85cb (svn r26845) -Fix [Squirrel]: more uninitialized variables in constructors 2014-09-17 18:35:45 +00:00
rubidium
d3a68c3391 (svn r26844) -Fix: clang compile error 2014-09-17 17:52:50 +00:00
rubidium
6defde275c (svn r26844) -Fix: clang compile error 2014-09-17 17:52:50 +00:00
rubidium
c35e638c36 (svn r26842) -Codechange [Squirrel]: other simple cases of non-initialised instance variables 2014-09-16 21:14:18 +00:00
rubidium
3c85109c49 (svn r26842) -Codechange [Squirrel]: other simple cases of non-initialised instance variables 2014-09-16 21:14:18 +00:00
rubidium
8560071dbc (svn r26841) -Codechange [Squirrel]: move the actual initialisation of instance variables of SQString into the constructor 2014-09-16 21:13:24 +00:00
rubidium
a1d4148be5 (svn r26841) -Codechange [Squirrel]: move the actual initialisation of instance variables of SQString into the constructor 2014-09-16 21:13:24 +00:00
rubidium
20cb257a05 (svn r26840) -Fix [Squirrel]: merge Init and constructor of SQSharedState 2014-09-16 21:11:14 +00:00
rubidium
1685118169 (svn r26840) -Fix [Squirrel]: merge Init and constructor of SQSharedState 2014-09-16 21:11:14 +00:00
rubidium
525316ea9b (svn r26839) -Fix [Squirrel]: some dead code and making switch fall throughs more explicit 2014-09-16 21:10:01 +00:00
rubidium
22fc96ad6b (svn r26839) -Fix [Squirrel]: some dead code and making switch fall throughs more explicit 2014-09-16 21:10:01 +00:00
rubidium
061be20b78 (svn r26838) -Fix (r26831): attempt to make MSVC like the code again 2014-09-16 20:14:03 +00:00
rubidium
0291a1be11 (svn r26838) -Fix (r26831): attempt to make MSVC like the code again 2014-09-16 20:14:03 +00:00
rubidium
e19dfdee99 (svn r26837) -Fix [Squirrel]: remove some pointless assignments 2014-09-16 20:09:20 +00:00
rubidium
74ceffd3c5 (svn r26837) -Fix [Squirrel]: remove some pointless assignments 2014-09-16 20:09:20 +00:00
rubidium
3d2f511f43 (svn r26836) -Fix [Squirrel]: merge SQLexer::Init with the constructor; there's no need to construct first and then call init in the next line 2014-09-16 20:08:44 +00:00
rubidium
9f249cfff9 (svn r26836) -Fix [Squirrel]: merge SQLexer::Init with the constructor; there's no need to construct first and then call init in the next line 2014-09-16 20:08:44 +00:00
rubidium
5502a19f3d (svn r26835) -Fix [Squirrel]: remove dead code from the lexer 2014-09-16 20:07:47 +00:00