Fixed endif and namespace ending mismatch #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jwellbelove
pushed a commit
that referenced
this pull request
Jul 27, 2018
* Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/private/minmax_pop.h * Merge remote-tracking branch 'origin/development' # Conflicts: # test/vs2017/etl.vcxproj.filters * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/version.h # support/Release notes.txt * Fixed endif and namespace ending mismatch (#74) * Merge remote-tracking branch 'origin/development' * Merge remote-tracking branch 'origin/development' * Update library.properties (#76) * Merge remote-tracking branch 'origin/development' * Updated version * Added MIT licence * Update README.md * Added master link * Update README.md * Merge remote-tracking branch 'origin/development' * Merge remote-tracking branch 'origin/development' * Fix license formatting so it will be recognized (#78) GitHub uses the licensee ruby gem to detect the license type of the repository. licensee uses the license texts from choosealicense.com so if the text of your license file differs from their license it will not be recognized. GitHub allows filtering searches by license type and also shows the license type on the homepage of your repository and when viewing the license page but these features are only available when the license is recognized. * Merge remote-tracking branch 'origin/development' * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/version.h # support/Release notes.txt * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/private/ivectorpointer.h # include/etl/version.h # src/private/pvoidvector.cpp # support/Release notes.txt # test/test_vector_pointer.cpp * Restrict destructors (#80) * hide observable destructor * hide fsm_state destructor, get_fsm_context in 0 specialisation made protected * Update observer.h Changed protected destructor in observble to use C++03 syntax. * Update fsm.h Minor formatting changes * Update fsm_generator.h Minor format changes * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/version.h # support/Release notes.txt * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/private/pvoidvector.h * Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/memory.h # include/etl/version.h # support/Release notes.txt * Use etl/ prefixed includes in sources and tests ETL is supposed to be included using #include <etl/header.h> according to the changelog entry from Sunday, March 18, 2018. This change updates the tests and etl source files to use the same style. This allows compiling etl as part of a separate project (git submodule) using the same flags as for user code that includes etl. Signed-off-by: Martin Sivak <mars@montik.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.