coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,327 Commits 33 Branches 373 Tags MIT 43 MiB
Commit Graph

1327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prasenjit Sengupta
da94b26b45 Cast enum in multimap.h correctly 2018-02-24 10:53:14 +00:00
John Wellbelove
4427576985 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/c/ecl_timer.c
#	src/debounce.h
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
 2018-02-18 14:16:26 +00:00
John Wellbelove
cdf638aeb5 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
#	test/test_pool.cpp
 2018-02-11 19:36:33 +00:00
John Wellbelove
4700f2613d Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	test/codeblocks/ETL.layout
 2018-02-11 18:42:47 +00:00
John Wellbelove
f062613d92 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
 2018-02-11 18:27:13 +00:00
John Wellbelove
cd3c596c88 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/callback_timer.h
#	src/message_timer.h
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
 2018-02-06 21:39:21 +00:00
John Wellbelove
0f762887fa Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/message_timer.h
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
#	test/ecl_user.h
#	test/etl_profile.h
 2018-02-06 00:18:21 +00:00
John Wellbelove
fda7e13811 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
 2018-02-04 17:41:24 +00:00
John Wellbelove
f2b2793dcd Merge branch 'development' 
# Conflicts:
#	library.properties
#	src/flat_map.h
#	src/flat_multimap.h
#	src/flat_multiset.h
#	src/flat_set.h
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
 2018-02-04 15:32:26 +00:00
John Wellbelove
c6233f72ba Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	support/Release notes.txt
#	test/codeblocks/ETL.layout
#	test/test_flat_map.cpp
#	test/test_flat_multimap.cpp
#	test/test_flat_multiset.cpp
#	test/test_flat_set.cpp
 2018-02-03 21:21:12 +00:00
John Wellbelove
1cf97975fb Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	test/codeblocks/ETL.layout
#	test/etl_profile.h
#	test/test_flat_set.cpp
 2018-02-02 15:30:27 +00:00
John Wellbelove
a7880f777e Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	test/codeblocks/ETL.layout
#	test/test_flat_set.cpp
#	test/vs2017/etl.vcxproj.filters
 2018-02-01 17:51:00 +00:00
John Wellbelove
811393c0b7 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	src/container.h
#	src/map.h
#	src/multimap.h
#	src/multiset.h
#	src/stack.h
#	test/codeblocks/ETL.layout
#	test/test_flat_set.cpp
#	test/test_vector_non_trivial.cpp
 2018-02-01 12:52:16 +00:00
John Wellbelove
865d837011 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/container.h
#	test/codeblocks/ETL.layout
#	test/test_flat_multimap.cpp
#	test/test_flat_multiset.cpp
#	test/test_flat_set.cpp
#	test/test_forward_list.cpp
 2018-01-30 09:22:38 +00:00
John Wellbelove
0884cf81d5 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/container.h
#	test/codeblocks/ETL.layout
 2018-01-29 12:27:47 +00:00
John Wellbelove
7fa74a17a2 Update unittest-cpp 2018-01-28 12:54:02 +00:00
John Wellbelove
b5b8d39e36 Try to fix unittest sub-module issues 2018-01-27 19:37:09 +00:00
John Wellbelove
b857a28a39 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/container.h
#	src/platform.h
#	src/profiles/gcc_generic.h
#	src/profiles/gcc_linux_x86.h
#	src/profiles/gcc_windows_x86.h
 2018-01-27 19:00:38 +00:00
John Wellbelove
c63efac888 Merge branch 'development' 
# Conflicts:
#	library.properties
#	src/container.h
#	support/Release notes.txt
10.11.2 		2018-01-23 16:50:01 +00:00
John Wellbelove
efd52cf4b6 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	library.properties
#	src/array_wrapper.h
#	src/container.h
#	src/platform.h
#	test/test_array_wrapper.cpp
#	test/vs2017/etl.vcxproj.filters
 2018-01-23 12:23:35 +00:00
John Wellbelove
8607294405 Merge remote-tracking branch 'origin/development' 2018-01-21 20:39:28 +00:00
Austin Morton
de3de548ba replace usages of _DEBUG with ETL_DEBUG 
fixes some -Wundef errors when _DEBUG was not defined
 2018-01-09 18:59:52 +00:00
John Wellbelove
bc978a92ef Merge remote-tracking branch 'origin/development' 2018-01-07 18:52:39 +00:00
John Wellbelove
2385d7797d Updated to 10.9.1 2018-01-07 18:48:44 +00:00
John Wellbelove
948ff528fd Corrected definition of ETL_DEBUG 2018-01-07 18:46:52 +00:00
John Wellbelove
8c21573808 Merge remote-tracking branch 'origin/development' 
# Conflicts:
#	test/codeblocks/ETL.layout
10.9.0 		2017-12-31 20:32:46 +00:00
John Wellbelove
6d660e87b4 Updated to 10.9.0 2017-12-31 20:30:07 +00:00
John Wellbelove
6d8f007c3b Merge remote-tracking branch 'origin/feature/array_and_string_view' into development 2017-12-31 20:23:31 +00:00
John Wellbelove
9140ddcd1c Added etl::string_view 2017-12-31 20:23:06 +00:00
John Wellbelove
a14e9b25bb Added default constructor. 
Made single parameter constructors explicit.
Added
  assign()
  remove_prefix()
  remove_suffix()
  operator = ()
 2017-12-30 17:32:14 +00:00
John Wellbelove
c86dc4ebbb Merge branch 'development' 2017-12-26 16:51:26 +00:00
John Wellbelove
b169bfbe41 Merge branch 'feature/array_and_string_view' into development 2017-12-26 16:51:01 +00:00
John Wellbelove
bcaa75a4e1 Added array_view to CodeBlocks 2017-12-26 16:50:47 +00:00
John Wellbelove
04ccae10c5 Merge branch 'development' 2017-12-26 16:42:44 +00:00
John Wellbelove
13ef0f5789 10.9.0 2017-12-26 16:42:24 +00:00
John Wellbelove
ba3f9e5e0b Merge branch 'development' 2017-12-26 16:40:19 +00:00
John Wellbelove
fb3c9c9e26 Merge branch 'feature/array_and_string_view' into development 2017-12-26 16:39:38 +00:00
John Wellbelove
835a5cbad0 Added array_view 2017-12-26 16:10:34 +00:00
John Wellbelove
8045ae55c4 Re-enabled ETL_IN_UNIT_TEST macros 2017-12-23 13:14:37 +00:00
John Wellbelove
d77cc23337 Re-enabled ETL_IN_UNIT_TEST macros 2017-12-23 13:09:39 +00:00
John Wellbelove
03f9f05a76 Re-enabled ETL_IN_UNIT_TEST macros 2017-12-23 13:08:04 +00:00
John Wellbelove
e9a8e3f55f Merge remote-tracking branch 'origin/development' 2017-12-22 20:12:30 +00:00
John Wellbelove
6779f87562 10.8.2 2017-12-22 20:11:30 +00:00
John Wellbelove
7760578666 10.8.2 2017-12-22 20:11:16 +00:00
John Wellbelove
2f7014d3f0 Minor comment change 2017-12-22 17:16:58 +00:00
John Wellbelove
35a94fcd7b Updated CRT SDK version 2017-12-22 16:38:28 +00:00
John Wellbelove
1a1ad71b5f Tidy FSM code. Remove redundant class. 2017-12-22 16:37:49 +00:00
John Wellbelove
a00cab9cfc Merge remote-tracking branch 'origin/development' 10.8.1 2017-12-22 11:15:30 +00:00
John Wellbelove
cc23016e9f Added release notes 2017-12-22 11:15:09 +00:00
John Wellbelove
07211212c0 Merge remote-tracking branch 'origin/development' 2017-12-22 11:12:52 +00:00