diff options
| author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-05-10 16:36:00 +0300 |
|---|---|---|
| committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-05-10 16:36:00 +0300 |
| commit | e222c02f21443c63e44745fe481342c7df5cf010 (patch) | |
| tree | 600938ae7f9e38ffda1b88822c05caf1f42b386a /include/zbxalgo.h | |
| parent | b559fd0b02b03665b538232b7a9c7cfa6408b369 (diff) | |
| parent | 17c7dcad60169b733b6852fd34ff06e4b4947f61 (diff) | |
A.F.I...S. [ZBXNEXT-6411] updated to latest master; resolved conflicts in :
# create/src/schema.tmpl
# create/src/templates.tmpl - ours for now
# include/zbxserver.h
# src/libs/zbxdbcache/dbconfig.c
# src/libs/zbxdbupgrade/dbupgrade_5030.c
# src/libs/zbxserver/expression.c
# ui/include/classes/import/CImportDataAdapter.php
# ui/include/classes/import/CConfigurationImport.php
# ui/include/classes/import/CConfigurationImportcompare.php
# ui/include/classes/import/importers/CTemplateImporter.php
# ui/include/classes/import/converters/C52ImportConverter.php
# ui/include/defines.inc.php
# ui/tests/unit/include/classes/import/CImportDataAdapterTest.php
# ui/tests/unit/include/classes/import/converters/C52ImportConverterTest.php
Diffstat (limited to 'include/zbxalgo.h')
| -rw-r--r-- | include/zbxalgo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/zbxalgo.h b/include/zbxalgo.h index a79b360ec95..4b29a42338a 100644 --- a/include/zbxalgo.h +++ b/include/zbxalgo.h @@ -330,6 +330,7 @@ ZBX_PTR_VECTOR_DECL(str, char *) ZBX_PTR_VECTOR_DECL(ptr, void *) ZBX_VECTOR_DECL(ptr_pair, zbx_ptr_pair_t) ZBX_VECTOR_DECL(uint64_pair, zbx_uint64_pair_t) +ZBX_VECTOR_DECL(dbl, double) /* this function is only for use with zbx_vector_XXX_clear_ext() */ /* and only if the vector does not contain nested allocations */ |