Commit Graph

923 Commits

Author SHA1 Message Date
Neil MacIntosh
c98e1f34a3 Merge pull request #229 from Microsoft/menuet-VS2013-fix-string_span-ctors
Merging in two fixes from menuet
2015-12-14 11:51:16 -08:00
Neil MacIntosh
9e1402dff8 Merge fixes from menuet, dropping max() macro workaround.
Conflicts:
	include/string_span.h
2015-12-14 11:38:20 -08:00
Neil MacIntosh
385780388e Merge branch 'VS2013-fix-string_span-ctors' of https://github.com/menuet/GSL into menuet-VS2013-fix-string_span-ctors 2015-12-14 11:08:58 -08:00
Pascal Menuet
f38ee4fb5e In VS2013, the std::equal does not have the overload that takes 4 iterators 2015-12-12 22:59:57 +01:00
Pascal Menuet
5e7e68c8b0 For VS2013, fix an ICE by replacing dummy template type parameter by a dummy function parameter 2015-12-12 22:51:49 +01:00
Pascal Menuet
37cdb6bc50 Disable macro max in Windows. Implement move ctors in string_span for VS2013. Remove redundant pragma warning pop for VS2013. 2015-12-11 20:47:07 +01:00
Neil MacIntosh
de62e7b0ae Merge pull request #224 from ZachHenkel/master
Add casts to eliminate signed/unsigned mismatch warnings
2015-12-09 14:18:59 -08:00
Zachary Henkel
293acf0640 Add casts to eliminate signed/unsigned mismatch warnings
Addresses issue #210 and VC's warning C4365
2015-12-09 13:59:32 -08:00
Zachary Henkel
004f0aba3b Merge pull request #2 from Microsoft/master
Update from Microsoft/GSL
2015-12-09 13:05:01 -08:00
Neil MacIntosh
eb28b21049 Merge pull request #221 from mcheese/master
Correct missing rename of bytes() to size_bytes()
2015-12-08 12:02:14 -08:00
Neil MacIntosh
f569813c18 Merge pull request #223 from annagrin/dev/annagrin/string_span_operator_fixes
string span operator fixes
2015-12-08 12:01:23 -08:00
Anna Gringauze
5926942cd7 Tyding up comments 2015-12-07 15:30:00 -08:00
Anna Gringauze
e19f6b5f36 Fixed a bug on creating a span from empty string 2015-12-07 15:22:11 -08:00
Anna Gringauze
c6f3579ad1 Changes for gcc and clang 2015-12-07 00:14:31 -08:00
Anna Gringauze
87c5daa6c4 Fixed operators and constructors for string_span 2015-12-07 00:14:25 -08:00
mcheese
eedd18d5b8 Correct missing rename of bytes() to size_bytes() 2015-12-06 13:43:03 +01:00
Neil MacIntosh
ace63c5a9d Merge pull request #218 from annagrin/dev/annagrin/string_span_fixes
Dev/annagrin/string span fixes
2015-12-02 13:26:15 -08:00
Anna Gringauze
4efa9e8f07 Run clang format 2015-12-02 12:43:45 -08:00
Anna Gringauze
de6dbacbf6 Addressed CR comments 2015-12-01 14:47:53 -08:00
Anna Gringauze
7077105b9d Added operator== 2015-12-01 13:41:28 -08:00
Anna Gringauze
8c5d06dc79 fixed GCC and clang compilation issues 2015-12-01 13:41:23 -08:00
Anna Gringauze
e3878a6556 merging with master 2015-12-01 13:41:18 -08:00
Neil MacIntosh
8e744b2671 Merge pull request #217 from neilmacintosh/dev/neilmac/bugfix
Addressing #178: wrong return type for function.
2015-11-30 18:26:55 -08:00
Neil MacIntosh
f76f739805 Addressing #178: wrong return type for function. 2015-11-30 18:20:14 -08:00
Neil MacIntosh
e10d2e3028 Merge pull request #216 from neilmacintosh/dev/neilmac/span-rework
Corrected some variable naming.
2015-11-29 21:40:11 -08:00
Neil MacIntosh
c9959b1071 Corrected some variable naming. 2015-11-30 05:34:38 +00:00
Neil MacIntosh
a32108c0be Merge pull request #215 from neilmacintosh/dev/neilmac/span-rework
Reworked span to match GSL design.
2015-11-29 19:25:59 -08:00
Neil MacIntosh
0cf947db77 Reworked span to match GSL design. 2015-11-29 19:19:37 -08:00
Neil MacIntosh
38eaf9fc95 Refactored headers so span can use narrow_cast etc. 2015-11-23 16:22:31 -08:00
Jason Horsburgh
7505111329 Add CMake install target for header files 2015-11-21 19:37:21 +00:00
Neil MacIntosh
3dfda0cfde Merge pull request #206 from neilmacintosh/dev/neilmac/contracts
Rework contract enforcement macros and use everywhere.
2015-11-20 17:26:17 -08:00
Neil MacIntosh
d5057370b8 Merge branch 'master' into dev/neilmac/contracts 2015-11-20 17:14:21 -08:00
Neil MacIntosh
d13f6daa75 Refactored to use Expects/Ensures everywhere. 2015-11-20 17:06:23 -08:00
Neil MacIntosh
343f71ff49 Merge pull request #205 from elronayellin/as_span_string
as_span(str) returns cstring_span regardless of constness of str #192
2015-11-20 16:04:13 -08:00
Elron A. Yellin
e4d8d35af5 add as_span overload for basic_string which doesn't have nonconst .data() like other contiguous containers 2015-11-20 17:50:02 -05:00
Neil MacIntosh
04050a2162 Merge pull request #204 from annagrin/dev/annagrin/fix_conversion_bug
Fixed conversion problem when creating strided_span from span and bounds
2015-11-19 17:57:07 -08:00
Anna Gringauze
c95eb57d3f Fixed conversion problem when creating strided_span from span and bounds 2015-11-19 13:13:15 -08:00
Neil MacIntosh
4552575e34 Merge pull request #201 from matus-chochlik/master
Made conversion of span<> to bool explicit
2015-11-19 09:15:40 -08:00
Matus Chochlik
73ec688674 Made conversion of span<> to bool explicit 2015-11-19 10:27:08 +01:00
Neil MacIntosh
e5c76a68e0 Merge pull request #199 from matus-chochlik/master
Added explicit cast to size_type in span constructor
2015-11-18 14:45:14 -08:00
Matus Chochlik
da75d0e757 Added explicit cast to size_type in span constructor
This silences implicit sign conversion warnings when constructing span
from containers which return size_t from size().
2015-11-18 17:45:36 +01:00
Neil MacIntosh
3cd0d523b6 Merge pull request #198 from Microsoft/dev/neilmac/fix-config-macro
Remove unnecessary workaround for max macro
2015-11-17 19:05:57 -08:00
Neil MacIntosh
106262f1ef Remove unnecessary workaround for max macro 2015-11-17 19:01:46 -08:00
Neil MacIntosh
7fc95710b6 Merge pull request #197 from neilmacintosh/dev/neilmac/defines
Clean up compiler-config macros.
2015-11-17 15:46:03 -08:00
Neil MacIntosh
107869a2e4 Merge branch 'master' of https://github.com/Microsoft/GSL into dev/neilmac/defines 2015-11-17 15:35:14 -08:00
Neil MacIntosh
292f81e5ef Tidied up compiler-config macros. 2015-11-17 15:07:51 -08:00
Neil MacIntosh
e3886084dc Merge pull request #195 from lukhase/master
fixes pragma undef warnings in MSVC2013
2015-11-17 14:02:57 -08:00
Lukas Haselsteiner
e51eb228ae fixes pragma undef warnings in MSVC2013 2015-11-15 23:08:35 +01:00
Neil MacIntosh
252671257f Merge pull request #190 from annagrin/dev/annagrin/remove_basic_span
Remove basic_span
2015-11-13 13:31:45 -08:00
Anna Gringauze
f510025109 Removed basic_span class 2015-11-13 12:54:37 -08:00