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

Merge branch 'development' into hot-fix/unordered_map_erase

Browse Source 
# Conflicts:
#	include/etl/version.h
#	support/Release notes.txt
This commit is contained in:
John Wellbelove 2019-02-13 11:18:58 +01:00
parent f61a6ebfdc
commit 15d49227c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/atomic/atomic_std.h
View File

@ -600,6 +600,6 @@ namespace etl
typedef std::atomic<ptrdiff_t> atomic_ptrdiff_t;
typedef std::atomic<intmax_t> atomic_intmax_t;
typedef std::atomic<uintmax_t> atomic_uintmax_t;
};
}
#endif