Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/cmakelists #106

Merged
merged 3 commits into from
Dec 20, 2018
Merged

Fix/cmakelists #106

merged 3 commits into from
Dec 20, 2018

Conversation

kiciek
Copy link
Contributor

@kiciek kiciek commented Dec 19, 2018

Build status shows only master branch status

@jwellbelove jwellbelove merged commit 6c7be9f into ETLCPP:master Dec 20, 2018
cmdc0de added a commit to cmdc0de/etl that referenced this pull request May 20, 2019
* Merge remote-tracking branch 'origin/development'

* First draft

* Renamed

* First draft

* Add default C++17 profiles (ETLCPP#95)

* Fix extra semicolon warning in list.h (ETLCPP#97)

* First draft

* Renamed

* Added entry and exit

* State Chart Template
Unit tests complete

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Made get_state_id non-virtual

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h

* Added start() and changed order of execution.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp

* Process event loops until action or end of transition table

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp

* Swapped event and current state parameters for state transition

* Swapped event and current state parameters for state transition

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_state_chart.cpp

* Added CRC16 MODBUS
Added ETL_ prefic to extern const arrays.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Removed push(void) push_back(void) and push_front(void) function for containers.

* Modified the API of etl::state_chart constructors.

* Merge remote-tracking branch 'origin/development'

* Made 'next state id' a member to support recursive events

* Made 'next state id' a member to support recursive events

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Use `deleter` in `etl::unique_ptr::reset(...)` (ETLCPP#98)

* Use diagnostic push and pop when suppressing GCC warnings to prevent suppressions from impacting code outside of ETL (ETLCPP#99)

* Merge remote-tracking branch 'origin/master' into development

* Added permuted congruential random generator

* Ignore PCG output file

* Updated release and version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Removed repeated semicolon, this helps to compile etl without errors (ETLCPP#100)

with -pedantic/-pedantic-errors flags.

* Merge remote-tracking branch 'origin/feature/bit_stream' into development

# Conflicts:
#	include/etl/profiles/armv6.h
#	include/etl/profiles/armv6_no_stl.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Merge from GitLab CMake-CLion feature branch

* Removed unused code

* Merge remote-tracking branch 'origin/development'

* Added copyright notice

* Merge remote-tracking branch 'origin/development'

* Trigger CI pipelines on gitlab

* [ETLCPP#101] Adding non-const emplace overloads for vector (ETLCPP#102)

* All header pvoidvector

* Removed CPP files

* Updated release notes

* Merge remote-tracking branch 'origin/development'

* Merge remote-tracking branch 'origin/development'

* Added hash based random number generator

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Added 'don't care current state' transition entry option.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix CMake build by converting etl to a INTERFACE library (ETLCPP#104)

The 14.0 release removed all cpp files

* Merge remote-tracking branch 'origin/feature/shared_pools' into development

# Conflicts:
#	include/etl/forward_list.h
#	include/etl/list.h
#	include/etl/private/pvoidvector.h
#	include/etl/state_chart.h
#	test/vs2017/etl.vcxproj
#	test/vs2017/etl.vcxproj.filters

* Updated version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development' into feature/emplace_var_arg

* Added C++03/C++11 emplace for deque, priority_queue, queues, stack, variant & vector.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h

* Updated versions

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Added move algorithms & utility.

* Added rvalue reference API

* Updated version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/deque.h
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/master' into feature/rvalue-references

# Conflicts:
#	include/etl/private/pvoidvector.h

* etl::deque push fix

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix/cmakelists (ETLCPP#106)

* remove absent file from CMakelists

File was propably semi-automaticaly added by CLion IDE

* Add gitlab pipeline badge

* Merge remote-tracking branch 'origin/feature/cumulative_moving_average' into development

* Added rvalue reference variants

* Minor change top variable declaration

* Added rvalue reference push_back & insert.

* Added conditional compile directives for C++11

* Added move constructor and assignment operator

* Added move tests

* Added move constructor & move assignment

* Added move member functions

* Added is_rvalue_reference

* Added interface move assignment.
Added move splice & merge.

* Added interface move assignment.

* Added interface move assignment.

* Added move only data type

* Fixed bugs in etl::flat_map 'operator[]' & 'insert'
Added tests.
Fixed lower_bound equality checks to use 'compare' type.

* Support C++98 for etl::sort (ETLCPP#107)

Default template arguments are not suported in function templates for C++98.

* Removed crc16_modbus.cpp

* Fix compile error in scheduler.h (ETLCPP#108)

* Fix compile error in scheduler.h

Missing semicolon in assert.

* Undo missplaced semicolon in scheduler.h

* Merge branch 'development' into feature/rvalue-references

* Updated version & release notes

* Merge remote-tracking branch 'origin/development'

* Update list.h to recognize C++11 mode (ETLCPP#111)

* Merge remote-tracking branch 'origin/development'

* Update list.h to recognize C++11 mode

* Update memory.h to handle C++11 (ETLCPP#110)

* Merge remote-tracking branch 'origin/development'

* Update memory.h to handle C++11

* Update vector.h to handle C++11 (ETLCPP#109)

* Merge remote-tracking branch 'origin/development'

* Update vector.h to handle C++11

* C++03/C++11 compatibility fixes.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/list.h
#	include/etl/vector.h
#	include/etl/version.h
#	support/Release notes.txt

* Update flat_map.h to handle C++98 compilation (ETLCPP#112)

* Reverted partial changes

* Added #include <new> to message_router.h for improved cross platform compatibility.

* Callback service

* Changed from static to normal class

* Added OFFSET template parameter

* Added const to template parameter

* Version & release notes.
Optimised internal 'unhandled' declaration.

* Fix vector insert for certain operations

* Added missing header include to frame_check_sequence.h

* Added constexpr to constructors and copy constructors.

* Updated callback service example

* Added NO_EXCEPT macros.
Added std::forward to alternate 'No STL' utility header.

* Renamed ETL_NO_EXCEPT to ETL_NOEXCEPT

* Added ETL_NOEXCEPT macros.
Added std::forward support to alternate STL utility header.

* C++03 check project

* Fixed accidentally modified main.cpp

* atomic_std: removed extra ';' semicolon after namespace (ETLCPP#114)

* Fix for unordered_map insert and erase bug.

* Merge remote-tracking branch 'origin/master' into development

* Merge branch 'development' into hot-fix/unordered_map_erase

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge branch 'hot-fix/unordered_map_erase' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/feature/rvalue-references' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Created C++03 Code::Blocks project as a quick check for C++03 syntax compatibility.

* Fixed C++03 macros leftover from testing

* Fix inconsistent ETL_FILE definitions

* function.h add const to operator () (ETLCPP#117)

Change-Id: Id70a05ab1bfdb95499a3c6622379c8bb639f5f40

* Move C++03 force macros to profile

* Enabled emplace functions for C++03

* Modified ISR queue to take references to etl::ifunction instances at runtime rather than static class at compile time.

* Revert "Modified ISR queue to take references to etl::ifunction instances at runtime rather than static class at compile time."

This reverts commit 4aab7c0.

* Added queue_spsc_locked with injected lock and unlock functionality.

* Updated profiles for C++17

* Modifies parameters to 'const'

* Add const ref istring constructors (ETLCPP#119)

* First commit

* Initial version

* Initial version

* Add basic Conan package (ETLCPP#120)

* Fixed string push_back bug where the internal terminator was not updated.

* Partial implementation

* Partial implementation of vector of pointers

* Partial unit test updates

* Added truncate clear to Clear()

* Partial updates

* Partial updates

* Partial updates

* Fixed setting of 'truncated'

* Modified 'truncated' to only be cleared on 'clear()' or 'assign()'.
Added assignment from zero terminated string pointer.

* Removed test for self in += operator.

* Extended 'truncate' flag rules.

* External buffer support for vector

* Updated version number

* Added C++11 variadic template version of etl::visiable and etl::visitor

* Updated version

* Added C++11 variadic template version of etl::observer

* Merge branch 'development' into feature/to_string

# Conflicts:
#	test/vs2017/etl.vcxproj.filters

* Created integral to_string.
Started etl::string tests.

* Completed unit tests

* Added named base settings

* Added etl::to_string, etl::to_wstring, etl::to_u16string and etl::to_u32string
plus formating support for integrals.
Updated version number.

* Merge remote-tracking branch 'origin/feature/to_string' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Changed etl::format_sepc template to etl::basic_firmat_spec.
Created individual format_spec typedefs for each string type.

* Merge remote-tracking branch 'origin/feature/to_string' into development

# Conflicts:
#	include/etl/format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_to_string.cpp
#	test/test_to_u16string.cpp
#	test/test_to_u32string.cpp
#	test/test_to_wstring.cpp
#	test/vs2017/etl.vcxproj.filters

* Final unit tests for all string types.

* Merge remote-tracking branch 'origin/master' into feature/to_string

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	test/test_to_string.cpp
#	test/test_to_u16string.cpp
#	test/test_to_u32string.cpp
#	test/test_to_wstring.cpp

* Final unit tests for all string types.

* Unified 'to_string' API

* Fixed test name

* Attempt to force changes to master

* Fixed bug in fractional part for floating point with leading zeros after the decimal point.

* Merge remote-tracking branch 'origin/hotfix/cyclic_value_for_unsigned' into development

# Conflicts:
#	include/etl/version.h

* Added 'emplace' to etl::optional.
C++03 & C++11 variants supplied depending on compiler support.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	support/Release notes.txt

* First code, no unit tests

* Added etl::multi_array

* Simplified definition

* Added variadic min and max functions.
etl::multimin
etl::multimin_compare
etl::multimin_iter
etl::multimin_iter_compare
etl::multimax
etl::multimax_compare
etl::multimax_iter
etl::multimax_iter_compare

* Updated doxygen comments

* Merge remote-tracking branch 'origin/master' into development

* Merge remote-tracking branch 'origin/feature/memory_set_clear' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/feature/memory_set_clear' into development

# Conflicts:
#	include/etl/memory.h
#	include/etl/version.h
#	support/Release notes.txt

* Added secure clear to strings.

* Added secure clear to strings.

* Added missing 'cleanup' to string's resize() method.

* Added size_of<>

* Added size_of<>

* Merge remote-tracking branch 'origin/feature/size_of' into development

* Merge remote-tracking branch 'origin/feature/delegates' into development

# Conflicts:
#	include/etl/type_traits.h
#	include/etl/type_traits_generator.h
#	test/test_type_traits.cpp

* Merge branch 'master' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
cmdc0de added a commit to cmdc0de/etl that referenced this pull request May 20, 2019
* Merge remote-tracking branch 'origin/development'

* First draft

* Renamed

* First draft

* Add default C++17 profiles (ETLCPP#95)

* Fix extra semicolon warning in list.h (ETLCPP#97)

* First draft

* Renamed

* Added entry and exit

* State Chart Template
Unit tests complete

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Made get_state_id non-virtual

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h

* Added start() and changed order of execution.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp

* Process event loops until action or end of transition table

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	test/test_state_chart.cpp

* Swapped event and current state parameters for state transition

* Swapped event and current state parameters for state transition

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/state_chart.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_state_chart.cpp

* Added CRC16 MODBUS
Added ETL_ prefic to extern const arrays.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Removed push(void) push_back(void) and push_front(void) function for containers.

* Modified the API of etl::state_chart constructors.

* Merge remote-tracking branch 'origin/development'

* Made 'next state id' a member to support recursive events

* Made 'next state id' a member to support recursive events

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Use `deleter` in `etl::unique_ptr::reset(...)` (ETLCPP#98)

* Use diagnostic push and pop when suppressing GCC warnings to prevent suppressions from impacting code outside of ETL (ETLCPP#99)

* Merge remote-tracking branch 'origin/master' into development

* Added permuted congruential random generator

* Ignore PCG output file

* Updated release and version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Removed repeated semicolon, this helps to compile etl without errors (ETLCPP#100)

with -pedantic/-pedantic-errors flags.

* Merge remote-tracking branch 'origin/feature/bit_stream' into development

# Conflicts:
#	include/etl/profiles/armv6.h
#	include/etl/profiles/armv6_no_stl.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Merge from GitLab CMake-CLion feature branch

* Removed unused code

* Merge remote-tracking branch 'origin/development'

* Added copyright notice

* Merge remote-tracking branch 'origin/development'

* Trigger CI pipelines on gitlab

* [ETLCPP#101] Adding non-const emplace overloads for vector (ETLCPP#102)

* All header pvoidvector

* Removed CPP files

* Updated release notes

* Merge remote-tracking branch 'origin/development'

* Merge remote-tracking branch 'origin/development'

* Added hash based random number generator

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Added 'don't care current state' transition entry option.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix CMake build by converting etl to a INTERFACE library (ETLCPP#104)

The 14.0 release removed all cpp files

* Merge remote-tracking branch 'origin/feature/shared_pools' into development

# Conflicts:
#	include/etl/forward_list.h
#	include/etl/list.h
#	include/etl/private/pvoidvector.h
#	include/etl/state_chart.h
#	test/vs2017/etl.vcxproj
#	test/vs2017/etl.vcxproj.filters

* Updated version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development' into feature/emplace_var_arg

* Added C++03/C++11 emplace for deque, priority_queue, queues, stack, variant & vector.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h

* Updated versions

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Added move algorithms & utility.

* Added rvalue reference API

* Updated version

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/deque.h
#	include/etl/private/pvoidvector.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/master' into feature/rvalue-references

# Conflicts:
#	include/etl/private/pvoidvector.h

* etl::deque push fix

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix/cmakelists (ETLCPP#106)

* remove absent file from CMakelists

File was propably semi-automaticaly added by CLion IDE

* Add gitlab pipeline badge

* Merge remote-tracking branch 'origin/feature/cumulative_moving_average' into development

* Added rvalue reference variants

* Minor change top variable declaration

* Added rvalue reference push_back & insert.

* Added conditional compile directives for C++11

* Added move constructor and assignment operator

* Added move tests

* Added move constructor & move assignment

* Added move member functions

* Added is_rvalue_reference

* Added interface move assignment.
Added move splice & merge.

* Added interface move assignment.

* Added interface move assignment.

* Added move only data type

* Fixed bugs in etl::flat_map 'operator[]' & 'insert'
Added tests.
Fixed lower_bound equality checks to use 'compare' type.

* Support C++98 for etl::sort (ETLCPP#107)

Default template arguments are not suported in function templates for C++98.

* Removed crc16_modbus.cpp

* Fix compile error in scheduler.h (ETLCPP#108)

* Fix compile error in scheduler.h

Missing semicolon in assert.

* Undo missplaced semicolon in scheduler.h

* Merge branch 'development' into feature/rvalue-references

* Updated version & release notes

* Merge remote-tracking branch 'origin/development'

* Update list.h to recognize C++11 mode (ETLCPP#111)

* Merge remote-tracking branch 'origin/development'

* Update list.h to recognize C++11 mode

* Update memory.h to handle C++11 (ETLCPP#110)

* Merge remote-tracking branch 'origin/development'

* Update memory.h to handle C++11

* Update vector.h to handle C++11 (ETLCPP#109)

* Merge remote-tracking branch 'origin/development'

* Update vector.h to handle C++11

* C++03/C++11 compatibility fixes.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/list.h
#	include/etl/vector.h
#	include/etl/version.h
#	support/Release notes.txt

* Update flat_map.h to handle C++98 compilation (ETLCPP#112)

* Reverted partial changes

* Added #include <new> to message_router.h for improved cross platform compatibility.

* Callback service

* Changed from static to normal class

* Added OFFSET template parameter

* Added const to template parameter

* Version & release notes.
Optimised internal 'unhandled' declaration.

* Fix vector insert for certain operations

* Added missing header include to frame_check_sequence.h

* Added constexpr to constructors and copy constructors.

* Updated callback service example

* Added NO_EXCEPT macros.
Added std::forward to alternate 'No STL' utility header.

* Renamed ETL_NO_EXCEPT to ETL_NOEXCEPT

* Added ETL_NOEXCEPT macros.
Added std::forward support to alternate STL utility header.

* C++03 check project

* Fixed accidentally modified main.cpp

* atomic_std: removed extra ';' semicolon after namespace (ETLCPP#114)

* Fix for unordered_map insert and erase bug.

* Merge remote-tracking branch 'origin/master' into development

* Merge branch 'development' into hot-fix/unordered_map_erase

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge branch 'hot-fix/unordered_map_erase' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Fix for unordered_multimap, unordered_set and unordered_multiset insert and erase bug.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/feature/rvalue-references' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Created C++03 Code::Blocks project as a quick check for C++03 syntax compatibility.

* Fixed C++03 macros leftover from testing

* Fix inconsistent ETL_FILE definitions

* function.h add const to operator () (ETLCPP#117)

Change-Id: Id70a05ab1bfdb95499a3c6622379c8bb639f5f40

* Move C++03 force macros to profile

* Enabled emplace functions for C++03

* Modified ISR queue to take references to etl::ifunction instances at runtime rather than static class at compile time.

* Revert "Modified ISR queue to take references to etl::ifunction instances at runtime rather than static class at compile time."

This reverts commit 4aab7c0.

* Added queue_spsc_locked with injected lock and unlock functionality.

* Updated profiles for C++17

* Modifies parameters to 'const'

* Add const ref istring constructors (ETLCPP#119)

* First commit

* Initial version

* Initial version

* Add basic Conan package (ETLCPP#120)

* Fixed string push_back bug where the internal terminator was not updated.

* Partial implementation

* Partial implementation of vector of pointers

* Partial unit test updates

* Added truncate clear to Clear()

* Partial updates

* Partial updates

* Partial updates

* Fixed setting of 'truncated'

* Modified 'truncated' to only be cleared on 'clear()' or 'assign()'.
Added assignment from zero terminated string pointer.

* Removed test for self in += operator.

* Extended 'truncate' flag rules.

* External buffer support for vector

* Updated version number

* Added C++11 variadic template version of etl::visiable and etl::visitor

* Updated version

* Added C++11 variadic template version of etl::observer

* Merge branch 'development' into feature/to_string

# Conflicts:
#	test/vs2017/etl.vcxproj.filters

* Created integral to_string.
Started etl::string tests.

* Completed unit tests

* Added named base settings

* Added etl::to_string, etl::to_wstring, etl::to_u16string and etl::to_u32string
plus formating support for integrals.
Updated version number.

* Merge remote-tracking branch 'origin/feature/to_string' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
#	test/vs2017/etl.vcxproj.filters

* Changed etl::format_sepc template to etl::basic_firmat_spec.
Created individual format_spec typedefs for each string type.

* Merge remote-tracking branch 'origin/feature/to_string' into development

# Conflicts:
#	include/etl/format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt
#	test/test_to_string.cpp
#	test/test_to_u16string.cpp
#	test/test_to_u32string.cpp
#	test/test_to_wstring.cpp
#	test/vs2017/etl.vcxproj.filters

* Final unit tests for all string types.

* Merge remote-tracking branch 'origin/master' into feature/to_string

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	test/test_to_string.cpp
#	test/test_to_u16string.cpp
#	test/test_to_u32string.cpp
#	test/test_to_wstring.cpp

* Final unit tests for all string types.

* Unified 'to_string' API

* Fixed test name

* Attempt to force changes to master

* Fixed bug in fractional part for floating point with leading zeros after the decimal point.

* Merge remote-tracking branch 'origin/hotfix/cyclic_value_for_unsigned' into development

# Conflicts:
#	include/etl/version.h

* Added 'emplace' to etl::optional.
C++03 & C++11 variants supplied depending on compiler support.

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/basic_format_spec.h
#	include/etl/private/to_string_helper.h
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/development'

# Conflicts:
#	include/etl/to_string.h
#	include/etl/to_u16string.h
#	include/etl/to_u32string.h
#	include/etl/to_wstring.h
#	support/Release notes.txt

* First code, no unit tests

* Added etl::multi_array

* Simplified definition

* Added variadic min and max functions.
etl::multimin
etl::multimin_compare
etl::multimin_iter
etl::multimin_iter_compare
etl::multimax
etl::multimax_compare
etl::multimax_iter
etl::multimax_iter_compare

* Updated doxygen comments

* Merge remote-tracking branch 'origin/master' into development

* Merge remote-tracking branch 'origin/feature/memory_set_clear' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt

* Merge remote-tracking branch 'origin/feature/memory_set_clear' into development

# Conflicts:
#	include/etl/memory.h
#	include/etl/version.h
#	support/Release notes.txt

* Added secure clear to strings.

* Added secure clear to strings.

* Added missing 'cleanup' to string's resize() method.

* Added size_of<>

* Added size_of<>

* Merge remote-tracking branch 'origin/feature/size_of' into development

* Merge remote-tracking branch 'origin/feature/delegates' into development

# Conflicts:
#	include/etl/type_traits.h
#	include/etl/type_traits_generator.h
#	test/test_type_traits.cpp

* Merge branch 'master' into development

# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants