]> git.ipfire.org Git - thirdparty/squid.git/commit - include/splay.h
Prep for merge from trunk: undo branch r13313, r13312, and r13311 that were
authorAlex Rousskov <rousskov@measurement-factory.com>
Tue, 24 Jun 2014 22:21:48 +0000 (16:21 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Tue, 24 Jun 2014 22:21:48 +0000 (16:21 -0600)
commitcfb88efb1e75015ac6c38fd975eb5c565f1c36b1
tree271e12b3e59a1d5d30d875ad9b4da3743880b2cc
parenta4b04ff8ede5b106b018f421dab76f33ace8ce09
Prep for merge from trunk: undo branch r13313, r13312, and r13311 that were
temporary undoing trunk r13266, r13269, and r13270 (std::vector migration).
90 files changed:
include/MemPoolMalloc.h
include/Stack.h [deleted file]
include/splay.h
lib/MemPoolMalloc.cc
src/ClientDelayConfig.cc
src/ClientDelayConfig.h
src/ConfigOption.cc
src/ConfigOption.h
src/CpuAffinityMap.cc
src/CpuAffinityMap.h
src/DelayPools.h
src/DelayTagged.h
src/DelayUser.h
src/DelayVector.h
src/DiskIO/DiskIOModule.cc
src/DiskIO/DiskIOModule.h
src/EventLoop.h
src/ExternalACLEntry.cc
src/FadingCounter.h
src/FwdState.cc
src/FwdState.h
src/Generic.h
src/HttpHdrRange.cc
src/HttpHeader.cc
src/HttpHeader.h
src/HttpHeaderRange.h
src/HttpRequest.cc
src/Makefile.am
src/Notes.cc
src/Notes.h
src/PeerSelectState.h
src/StoreFileSystem.cc
src/StoreFileSystem.h
src/StoreHashIndex.h
src/acl/Acl.cc
src/acl/Acl.h
src/acl/NoteData.cc
src/adaptation/AccessCheck.cc
src/adaptation/AccessCheck.h
src/adaptation/AccessRule.h
src/adaptation/Config.cc
src/adaptation/Config.h
src/adaptation/DynamicGroupCfg.cc
src/adaptation/DynamicGroupCfg.h
src/adaptation/History.h
src/adaptation/Service.cc
src/adaptation/Service.h
src/adaptation/ServiceGroups.cc
src/adaptation/ServiceGroups.h
src/adaptation/icap/Config.cc
src/adaptation/icap/Options.cc
src/adaptation/icap/Options.h
src/adaptation/icap/ServiceRep.cc
src/adaptation/icap/ServiceRep.h
src/auth/Config.h
src/auth/Gadgets.cc
src/auth/Scheme.cc
src/auth/Scheme.h
src/base/Makefile.am
src/base/Vector.cc [deleted file]
src/base/Vector.h [deleted file]
src/cache_cf.cc
src/cbdata.cc
src/client_side.cc
src/client_side_request.cc
src/comm/AcceptLimiter.cc
src/comm/AcceptLimiter.h
src/comm/forward.h
src/delay_pools.cc
src/errorpage.cc
src/esi/CustomParser.cc
src/esi/VarState.cc
src/esi/VarState.h
src/event.h
src/fs/rock/RockSwapDir.h
src/fs/ufs/UFSSwapDir.cc
src/ipc/Coordinator.h
src/ipc/Kids.cc
src/ipc/Kids.h
src/ipc/Queue.h
src/store.cc
src/store_dir.cc
src/tests/stub_DiskIOModule.cc
src/tests/stub_libauth.cc
src/tests/testVector.cc [deleted file]
src/tests/testVector.h [deleted file]
src/tests/test_http_range.cc
src/tunnel.cc
test-suite/Makefile.am
test-suite/StackTest.cc [deleted file]