Commit Graph

44 Commits (ba34ec7ade01edb90452f9b63ce8a6aeb7ffc861)

Author SHA1 Message Date
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
5 years ago
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Jonathan G Rennison 87142ed840 Add a PreCleanPool() static method to pool item types. 7 years ago
Jonathan G Rennison 2a2ff30c3f Fix Pool verbose assertion format string on Windows platforms. 8 years ago
Jonathan G Rennison a703e2ff58 Increase verbosity of Pool assertion failure messages. 8 years ago
frosch 858e80f3dd (svn r26333) -Fix: Compilation without static_assert. 11 years ago
frosch a92bf49191 (svn r26333) -Fix: Compilation without static_assert. 11 years ago
fonsinchen e37656f2e5 (svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs. 11 years ago
fonsinchen 86ebb981f1 (svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs. 11 years ago
fonsinchen e21ae34878 (svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem. 11 years ago
fonsinchen 85fc5fbedf (svn r25887) -Fix: Ignore NULL pointers in delete operator of PoolItem. 11 years ago
rubidium 13855f0a09 (svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753) 11 years ago
rubidium c702853917 (svn r25705) -Fix: a number of typos (inspired by 90c920601c84975acb694f3673e2beb08b013753) 11 years ago
frosch 18ae9c78bc (svn r25402) -Fix-ish: Prevent copying of BasePool and WindowDesc, since they register in static vectors. 11 years ago
frosch dd5be60322 (svn r25402) -Fix-ish: Prevent copying of BasePool and WindowDesc, since they register in static vectors. 11 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
truebrain 1c9bec1999 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 13 years ago
truebrain aa1a0053b0 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 13 years ago
planetmaker ac0700c564 (svn r22136) -Fix (r22112): Silence compiler warning about non-virtual destructor 14 years ago
planetmaker 4f3066cd73 (svn r22136) -Fix (r22112): Silence compiler warning about non-virtual destructor 14 years ago
smatz 756cc6cf65 (svn r22116) -Codechange: use PoolBase::Clean() at more places 14 years ago
smatz c85e1c3089 (svn r22116) -Codechange: use PoolBase::Clean() at more places 14 years ago
smatz 642fb19d4f (svn r22115) -Fix (r22114): some comments and code ordering were wrong 14 years ago
smatz 9c40059641 (svn r22115) -Fix (r22114): some comments and code ordering were wrong 14 years ago
smatz 5fd13843f7 (svn r22112) -Codechange: register all pools in a pool vector 14 years ago
smatz 0e12107ccd (svn r22112) -Codechange: register all pools in a pool vector 14 years ago
smatz fbfb0ffbf2 (svn r22041) -Codechange: add a check that we called PoolItem::CanAllocateItem() before actually allocating it 14 years ago
smatz 817392c9b0 (svn r22041) -Codechange: add a check that we called PoolItem::CanAllocateItem() before actually allocating it 14 years ago
rubidium eb299736c1 (svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n]. 14 years ago
rubidium 43c8073551 (svn r21886) -Codechange: move documentation towards the code to make it more likely to be updated [n]. 14 years ago
rubidium 485b5a9c2f (svn r18045) -Fix: GCC 4.5@HEAD not compiling OpenTTD anymore because of a "non-placement deallocation function [is] selected for placement delete", or in other words delete(void *, size_t) is 'magic'.
We implemented these delete(void *, size_t) operator functions because MSVC warned that "no matching operator delete found; memory will not be freed if initialization throws an exception" for new(size_t, size_t).
This disables MSVC warning about this because we do not use exceptions in the (constructors that use the) overridden allocation functions, as such they will never be called; delete(void *) remains necessary though.
15 years ago
rubidium eeb6cf766b (svn r18045) -Fix: GCC 4.5@HEAD not compiling OpenTTD anymore because of a "non-placement deallocation function [is] selected for placement delete", or in other words delete(void *, size_t) is 'magic'.
We implemented these delete(void *, size_t) operator functions because MSVC warned that "no matching operator delete found; memory will not be freed if initialization throws an exception" for new(size_t, size_t).
This disables MSVC warning about this because we do not use exceptions in the (constructors that use the) overridden allocation functions, as such they will never be called; delete(void *) remains necessary though.
15 years ago
rubidium 1528b64a68 (svn r17839) -Codechange: implement the concept of 'caching' pool items to pools, that is instead of 'free' push the unused items in a linked list and use them on 'malloc'. Also add the concept of zeroing, or actually not zeroing, on new for pool items. 15 years ago
rubidium 5ce38e4fdd (svn r17839) -Codechange: implement the concept of 'caching' pool items to pools, that is instead of 'free' push the unused items in a linked list and use them on 'malloc'. Also add the concept of zeroing, or actually not zeroing, on new for pool items. 15 years ago
rubidium 0ebe525e5b (svn r17838) -Document: the Pool struct's template parameters 15 years ago
rubidium 9321dccf1e (svn r17838) -Document: the Pool struct's template parameters 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
rubidium 99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
smatz c861d9b64b (svn r16745) -Fix [FS#3011]: invalidate JoinStation window after removing item from the pool 15 years ago
smatz aa4ccab6a8 (svn r16745) -Fix [FS#3011]: invalidate JoinStation window after removing item from the pool 15 years ago
smatz 56a7b70591 (svn r16380) -Codechange: rename pool.hpp to pool_type.hpp 15 years ago
smatz 3793b966c3 (svn r16380) -Codechange: rename pool.hpp to pool_type.hpp 15 years ago