Commit Graph

203 Commits (83a063f51c7282b726a80f5da7407e9a4eca5b90)

Author SHA1 Message Date
Jonathan G Rennison 91e08c6cea Merge branch 'cpp-btree' into jgrpp 6 years ago
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.
6 years ago
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
6 years ago
Charles Pigott 5f86e1a390 Codechange: Silence -Wclass-memaccess warnings with GCC8 6 years ago
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
6 years ago
Niels Martin Hansen 836d25e738 Codechange: Address some MSVC compiler warnings 6 years ago
Jonathan G Rennison 8353a4d095 Merge branch 'cpp-btree' into jgrpp 6 years ago
Jonathan G Rennison 133ccabf42 btree: Use static_assert instead of workaround macro 6 years ago
Jonathan G Rennison f77a368268 Merge branch 'crashlog_improvements' into jgrpp 7 years ago
frosch 3bedb43de4 (svn r27896) -Fix: some warnings 7 years ago
frosch 062c736437 (svn r27896) -Fix: some warnings 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 344f39196f cpp-btree: Remove remaining uses of ssize_t
This is due to issues building on Windows
8 years ago
Jonathan G Rennison 418e9f4158 Remove assert.h include from btree.h, as this overrides OpenTTD's assert 8 years ago
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.
8 years ago
rubidium dd5e3d9f33 (svn r27605) -Fix: GCC 6 warning about misleading indentation 8 years ago
rubidium ac6312d33c (svn r27605) -Fix: GCC 6 warning about misleading indentation 8 years ago
matthijs 7e06cdb455 (svn r27561) -Fix [Squirrel]: Fix typos in error messages 8 years ago
matthijs 576005b714 (svn r27561) -Fix [Squirrel]: Fix typos in error messages 8 years ago
rubidium 809161ebf2 (svn r27289) -Fix: some uninitialised instance variables 9 years ago
rubidium d05ac99d52 (svn r27289) -Fix: some uninitialised instance variables 9 years ago
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 10 years ago
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 10 years ago
frosch 93fb724f87 (svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles) 10 years ago
frosch 396dde1636 (svn r27092) -Fix/Add [FS#6186]: Compilation on OS/2 (smedles) 10 years ago
rubidium 660a95e5d2 (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium 771dcf3b7b (svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments 10 years ago
rubidium 6a1ed21342 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 10 years ago
rubidium 79ca66eb67 (svn r26853) -Cleanup [Squirrel]: remove some stuff that we never did and especially never should use 10 years ago
rubidium e87572d103 (svn r26845) -Fix [Squirrel]: more uninitialized variables in constructors 10 years ago
rubidium dba98e85cb (svn r26845) -Fix [Squirrel]: more uninitialized variables in constructors 10 years ago
rubidium d3a68c3391 (svn r26844) -Fix: clang compile error 10 years ago
rubidium 6defde275c (svn r26844) -Fix: clang compile error 10 years ago
rubidium c35e638c36 (svn r26842) -Codechange [Squirrel]: other simple cases of non-initialised instance variables 10 years ago
rubidium 3c85109c49 (svn r26842) -Codechange [Squirrel]: other simple cases of non-initialised instance variables 10 years ago
rubidium 8560071dbc (svn r26841) -Codechange [Squirrel]: move the actual initialisation of instance variables of SQString into the constructor 10 years ago
rubidium a1d4148be5 (svn r26841) -Codechange [Squirrel]: move the actual initialisation of instance variables of SQString into the constructor 10 years ago
rubidium 20cb257a05 (svn r26840) -Fix [Squirrel]: merge Init and constructor of SQSharedState 10 years ago
rubidium 1685118169 (svn r26840) -Fix [Squirrel]: merge Init and constructor of SQSharedState 10 years ago
rubidium 525316ea9b (svn r26839) -Fix [Squirrel]: some dead code and making switch fall throughs more explicit 10 years ago
rubidium 22fc96ad6b (svn r26839) -Fix [Squirrel]: some dead code and making switch fall throughs more explicit 10 years ago
rubidium 061be20b78 (svn r26838) -Fix (r26831): attempt to make MSVC like the code again 10 years ago
rubidium 0291a1be11 (svn r26838) -Fix (r26831): attempt to make MSVC like the code again 10 years ago
rubidium e19dfdee99 (svn r26837) -Fix [Squirrel]: remove some pointless assignments 10 years ago
rubidium 74ceffd3c5 (svn r26837) -Fix [Squirrel]: remove some pointless assignments 10 years ago
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 10 years ago
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 10 years ago
rubidium 5502a19f3d (svn r26835) -Fix [Squirrel]: remove dead code from the lexer 10 years ago