Browse files

various: Change mpool.h include to mm.h.

  • Loading branch information...
1 parent 2fda356 commit d1fc52f5c1eff1d267fcb4ac371f111f6c3f342d Christopher Alfeld committed Feb 27, 2014
Showing with 42 additions and 45 deletions.
  1. +0 −1 docs/reference-manual/extending-ironbee/pocsig-setup.txt
  2. +1 −1 engine/core.c
  3. +1 −1 engine/filter.c
  4. +1 −1 engine/module.c
  5. +1 −1 engine/rule_engine.c
  6. +1 −1 engine/site.c
  7. +1 −1 engine/tests/test_action.cpp
  8. +1 −1 engine/tests/test_core_actions.cpp
  9. +1 −1 engine/tests/test_ironbee_lua_api.cpp
  10. +1 −1 engine/tests/test_ironbee_lua_configs.cpp
  11. +1 −1 engine/tests/test_ironbee_lua_modules.cpp
  12. +1 −1 engine/tests/test_kvstore.cpp
  13. +1 −1 engine/tests/test_operator.cpp
  14. +1 −1 engine/tests/test_parsed_content.cpp
  15. +1 −1 engine/tests/test_rule_inject.cpp
  16. +1 −1 engine/transformation.c
  17. +1 −0 include/ironbee/engine_types.h
  18. +1 −1 include/ironbee/string.h
  19. +1 −1 include/ironbee/strval.h
  20. +0 −1 include/ironbee/util.h
  21. +1 −1 modules/abort.c
  22. +1 −1 modules/geoip.c
  23. +1 −1 modules/sqltfn.c
  24. +1 −1 modules/testops.c
  25. +1 −1 modules/tests/test_ibmod_engine_shutdown.cpp
  26. +1 −1 modules/tests/test_module_pcre.cpp
  27. +1 −1 modules/tests/test_module_rules_lua.cpp
  28. +1 −1 modules/tests/test_persistence.cpp
  29. +1 −1 modules/tests/test_xrules.cpp
  30. +1 −1 tests/ibtest_log_fixture.hpp
  31. +1 −1 util/json_yajl_encode.c
  32. +1 −1 util/strtrim.c
  33. +1 −1 util/strwspc.c
  34. +1 −1 util/tests/test_util_cfgmap.cpp
  35. +1 −1 util/tests/test_util_decode.cpp
  36. +1 −1 util/tests/test_util_escape.cpp
  37. +1 −1 util/tests/test_util_field.cpp
  38. +1 −1 util/tests/test_util_flags.cpp
  39. +1 −1 util/tests/test_util_hash.cpp
  40. +1 −1 util/tests/test_util_lock.cpp
  41. +1 −1 util/tests/test_util_logformat.cpp
  42. +0 −2 util/tests/test_util_mpool.cpp
  43. +1 −1 util/tests/test_util_resource_pool.cpp
  44. +1 −1 util/tests/test_util_strval.cpp
  45. +1 −1 util/tests/test_util_vector.cpp
View
1 docs/reference-manual/extending-ironbee/pocsig-setup.txt
@@ -2,7 +2,6 @@
#include <ironbee/engine.h>
#include <ironbee/debug.h>
-#include <ironbee/mpool.h>
#include <ironbee/cfgmap.h>
#include <ironbee/module.h>
#include <ironbee/provider.h>
View
2 engine/core.c
@@ -46,7 +46,7 @@
#include <ironbee/flags.h>
#include <ironbee/json.h>
#include <ironbee/logevent.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/rule_defs.h>
#include <ironbee/rule_engine.h>
#include <ironbee/string.h>
View
2 engine/filter.c
@@ -28,7 +28,7 @@
#include <ironbee/engine.h>
#include <ironbee/log.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <inttypes.h>
#include <string.h>
View
2 engine/module.c
@@ -32,7 +32,7 @@
#include <ironbee/context.h>
#include <ironbee/dso.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/rule_engine.h>
#include <assert.h>
View
2 engine/rule_engine.c
@@ -40,7 +40,7 @@
#include <ironbee/escape.h>
#include <ironbee/field.h>
#include <ironbee/flags.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/operator.h>
#include <ironbee/rule_logger.h>
#include <ironbee/transformation.h>
View
2 engine/site.c
@@ -30,7 +30,7 @@
#include <ironbee/engine.h>
#include <ironbee/hash.h>
#include <ironbee/ip.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <assert.h>
View
2 engine/tests/test_action.cpp
@@ -25,7 +25,7 @@
#include <ironbee/action.h>
#include <ironbee/server.h>
#include <ironbee/engine.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include "gtest/gtest.h"
View
2 engine/tests/test_core_actions.cpp
@@ -25,7 +25,7 @@
#include <ironbee/action.h>
#include <ironbee/server.h>
#include <ironbee/engine.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <ironbee/var.h>
View
2 engine/tests/test_ironbee_lua_api.cpp
@@ -33,7 +33,7 @@ extern "C" {
#include <ironbee/release.h>
#include <ironbee/engine.h>
#include <ironbee/field.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
View
2 engine/tests/test_ironbee_lua_configs.cpp
@@ -28,7 +28,7 @@ extern "C" {
#include <ironbee/release.h>
#include <ironbee/engine.h>
#include <ironbee/field.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
View
2 engine/tests/test_ironbee_lua_modules.cpp
@@ -28,7 +28,7 @@ extern "C" {
#include <ironbee/release.h>
#include <ironbee/engine.h>
#include <ironbee/field.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <lauxlib.h>
#include <lua.h>
#include <lualib.h>
View
2 engine/tests/test_kvstore.cpp
@@ -26,7 +26,7 @@ extern "C" {
#include "util/kvstore_private.h"
#include <ironbee/kvstore.h>
#include <ironbee/kvstore_filesystem.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/util.h>
#include <ironbee/uuid.h>
#include <ironbee/mm_mpool.h>
View
2 engine/tests/test_operator.cpp
@@ -27,7 +27,7 @@
#include <ironbee/server.h>
#include <ironbee/context.h>
#include <ironbee/engine.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include "gtest/gtest.h"
View
2 engine/tests/test_parsed_content.cpp
@@ -27,7 +27,7 @@
/* Header of what we are testing. */
#include <ironbee/parsed_content.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
// TODO: Put this in the base fixture
#define ASSERT_MEMEQ(a,b,n) \
View
2 engine/tests/test_rule_inject.cpp
@@ -27,7 +27,7 @@
#include "ibtest_util.hpp"
#include "engine_private.h"
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/rule_defs.h>
#include <ironbee/rule_engine.h>
View
2 engine/transformation.c
@@ -32,7 +32,7 @@
#include <ironbee/engine.h>
#include <ironbee/field.h>
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <assert.h>
#include <string.h>
View
1 include/ironbee/engine_types.h
@@ -28,6 +28,7 @@
#include <ironbee/array.h>
#include <ironbee/clock.h>
#include <ironbee/hash.h>
+#include <ironbee/mm.h>
#include <ironbee/mpool.h>
#include <ironbee/parsed_content.h>
#include <ironbee/rule_defs.h>
View
2 include/ironbee/string.h
@@ -27,7 +27,7 @@
#include <ironbee/build.h>
#include <ironbee/field.h> /* For ib_num_t */
-#include <ironbee/mm.h> /* For ib_num_t */
+#include <ironbee/mm.h>
#include <stdlib.h>
#include <string.h>
View
2 include/ironbee/strval.h
@@ -27,7 +27,7 @@
*/
#include <ironbee/list.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/types.h>
#ifdef __cplusplus
View
1 include/ironbee/util.h
@@ -27,7 +27,6 @@
#include <ironbee/build.h>
#include <ironbee/mm.h>
-#include <ironbee/mpool.h>
#include <ironbee/types.h>
#include <stdarg.h>
View
2 modules/abort.c
@@ -80,7 +80,7 @@
#include <ironbee/engine_state.h>
#include <ironbee/hash.h>
#include <ironbee/module.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/rule_engine.h>
#include <ironbee/string.h>
View
2 modules/geoip.c
@@ -28,7 +28,7 @@
#include <ironbee/escape.h>
#include <ironbee/field.h>
#include <ironbee/module.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <GeoIP.h>
View
2 modules/sqltfn.c
@@ -28,7 +28,7 @@
*/
#include <ironbee/module.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/transformation.h>
#include <ironbee/util.h>
View
2 modules/testops.c
@@ -51,7 +51,7 @@
#include <ironbee/field.h>
#include <ironbee/list.h>
#include <ironbee/module.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/operator.h>
#include <ironbee/rule_engine.h>
#include <ironbee/string.h>
View
2 modules/tests/test_ibmod_engine_shutdown.cpp
@@ -27,7 +27,7 @@
#include "base_fixture.h"
#include <ironbee/operator.h>
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/bytestr.h>
View
2 modules/tests/test_module_pcre.cpp
@@ -28,7 +28,7 @@
#include <ironbee/rule_engine.h>
#include <ironbee/operator.h>
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/capture.h>
#include <ironbee/bytestr.h>
View
2 modules/tests/test_module_rules_lua.cpp
@@ -31,7 +31,7 @@ extern "C" {
#include "ibtest_util.hpp"
#include "engine_private.h"
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/uuid.h>
#include <string>
View
2 modules/tests/test_persistence.cpp
@@ -27,7 +27,7 @@
#include "base_fixture.h"
#include <ironbee/operator.h>
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/bytestr.h>
View
2 modules/tests/test_xrules.cpp
@@ -27,7 +27,7 @@
#include "base_fixture.h"
#include <ironbee/operator.h>
#include <ironbee/hash.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/bytestr.h>
View
2 tests/ibtest_log_fixture.hpp
@@ -25,7 +25,7 @@
#ifndef __IBTEST_LOG_FIXTURE_H__
#define __IBTEST_LOG_FIXTURE_H__
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include "gtest/gtest.h"
View
2 util/json_yajl_encode.c
@@ -28,7 +28,7 @@
#include <ironbee/field.h>
#include <ironbee/json.h>
#include <ironbee/list.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <ironbee/types.h>
#include <ironbee/util.h>
View
2 util/strtrim.c
@@ -23,7 +23,7 @@
#include "ironbee_config_auto.h"
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <ironbee/types.h>
View
2 util/strwspc.c
@@ -23,7 +23,7 @@
#include "ironbee_config_auto.h"
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <ironbee/types.h>
View
2 util/tests/test_util_cfgmap.cpp
@@ -29,7 +29,7 @@
#include "gtest/gtest.h"
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/field.h>
#include <ironbee/cfgmap.h>
View
2 util/tests/test_util_decode.cpp
@@ -29,7 +29,7 @@
#include <ironbee/util.h>
#include <ironbee/decode.h>
#include <ironbee/mm_mpool.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include "ibtest_textbuf.hpp"
#include "ibtest_strbase.hpp"
View
2 util/tests/test_util_escape.cpp
@@ -27,7 +27,7 @@
#include <ironbee/types.h>
#include <ironbee/string.h>
#include <ironbee/util.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/mm_mpool.h>
#include <ironbee/list.h>
#include <ironbee/escape.h>
View
2 util/tests/test_util_field.cpp
@@ -31,7 +31,7 @@
#include <ironbee/field.h>
#include <ironbee/string.h>
#include <ironbee/util.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/bytestr.h>
#include <stdexcept>
View
2 util/tests/test_util_flags.cpp
@@ -29,7 +29,7 @@
#include "gtest/gtest.h"
#include <ironbee/list.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/mm_mpool.h>
#include <ironbee/strval.h>
#include <ironbee/types.h>
View
2 util/tests/test_util_hash.cpp
@@ -30,7 +30,7 @@
#include "gtest/gtest.h"
#include "simple_fixture.hpp"
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <stdexcept>
View
2 util/tests/test_util_lock.cpp
@@ -25,7 +25,7 @@
#include "ironbee_config_auto.h"
#include <ironbee/types.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/util.h>
#include <ironbee/lock.h>
View
2 util/tests/test_util_logformat.cpp
@@ -25,7 +25,7 @@
#include "ironbee_config_auto.h"
#include <ironbee/types.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/util.h>
#include <ironbee/logformat.h>
View
2 util/tests/test_util_mpool.cpp
@@ -37,9 +37,7 @@
#pragma clang diagnostic pop
#endif
-#include <ironbee/mm.h>
#include <ironbee/mm_mpool.h>
-#include <ironbee/mpool.h>
using namespace std;
View
2 util/tests/test_util_resource_pool.cpp
@@ -24,7 +24,7 @@
#include "ironbee_config_auto.h"
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/mm_mpool.h>
#include <ironbee/resource_pool.h>
View
2 util/tests/test_util_strval.cpp
@@ -29,7 +29,7 @@
#include "gtest/gtest.h"
#include <ironbee/list.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/string.h>
#include <ironbee/types.h>
View
2 util/tests/test_util_vector.cpp
@@ -25,7 +25,7 @@
#include "ironbee_config_auto.h"
#include <ironbee/vector.h>
-#include <ironbee/mpool.h>
+#include <ironbee/mm.h>
#include <ironbee/mm_mpool.h>
#include <ironbee/util.h>

0 comments on commit d1fc52f

Please sign in to comment.