coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 13:58:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Wellbelove 2018-09-22 09:45:43 +01:00
parent c596ae8f6a
commit 8e83f95164
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/etl/basic_string.h
View File

@ -54,6 +54,7 @@ SOFTWARE.
#define ETL_FILE "27"
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
@ -2232,6 +2233,10 @@ namespace etl
#include "private/minmax_pop.h"
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic pop
#endif
#undef ETL_FILE
#endif

2
include/etl/memory.h
View File

@ -864,7 +864,7 @@ namespace etl
pointer value = p;
p = p_;
delete value;
deleter(value);
}
void swap(unique_ptr& value)

5
include/etl/private/pvoidvector.h
View File

@ -45,6 +45,7 @@ SOFTWARE.
#include "../stl/iterator.h"
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
@ -204,6 +205,10 @@ namespace etl
#include "minmax_pop.h"
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic pop
#endif
#undef ETL_IN_PVOIDVECTOR
#endif

7
include/etl/vector.h
View File

@ -59,7 +59,8 @@ SOFTWARE.
#endif
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
//*****************************************************************************
@ -1223,4 +1224,8 @@ namespace etl
#include "private/ivectorpointer.h"
#ifdef ETL_COMPILER_GCC
#pragma GCC diagnostic pop
#endif
#endif