diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-20 13:55:19 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-20 13:55:19 +0200 |
| commit | 13a19b78ba45353f9a6a59c8dbb02336c339db35 (patch) | |
| tree | a3a8fb95a6d4ba1ab52db4da81ee3b277b0306a8 /src/include | |
| parent | 2b2f3018bd91e50c874cfab4df4a847941cb140c (diff) | |
| download | abrt-13a19b78ba45353f9a6a59c8dbb02336c339db35.tar.gz abrt-13a19b78ba45353f9a6a59c8dbb02336c339db35.tar.xz abrt-13a19b78ba45353f9a6a59c8dbb02336c339db35.zip | |
daemon: simplify parsing of settings; remove remaining c++isms in daemon
This change will not compile, because in C++, void* cannot be
automatically cast to char*. Next change renames Settings.cpp to *.c
and fixes this.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/abrt_types.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/include/abrt_types.h b/src/include/abrt_types.h index 71cd67e1..4636bb7d 100644 --- a/src/include/abrt_types.h +++ b/src/include/abrt_types.h @@ -23,10 +23,7 @@ extern "C" { #endif -/* We can't typedef it to map_string_t, since other parts of ABRT - * (daemon, cli) still use that name for C++ container. For now, - * let's call it map_string_h: - */ +/* TODO: rename to map_string_t */ typedef GHashTable map_string_h; #define new_map_string abrt_new_map_string @@ -41,30 +38,8 @@ const char *get_map_string_item_or_NULL(map_string_h *ms, const char *key) return (const char*)g_hash_table_lookup(ms, key); } - #ifdef __cplusplus } #endif - -#ifdef __cplusplus - -#include <map> -#include <set> -#include <vector> -#include <string> - -typedef std::vector<std::string> vector_string_t; -typedef std::set<std::string> set_string_t; -typedef std::pair<std::string, std::string> pair_string_string_t; -typedef std::map<std::string, std::string> map_string_t; - -typedef std::vector<pair_string_string_t> vector_pair_string_string_t; -typedef std::vector<map_string_t> vector_map_string_t; -typedef std::map<std::string, map_string_t> map_map_string_t; -typedef std::map<std::string, vector_string_t> map_vector_string_t; -typedef std::map<std::string, vector_pair_string_string_t> map_vector_pair_string_string_t; - -#endif /* __cplusplus */ - #endif |