← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-218

« back to all changes in this revision

Viewing changes to drizzled/module/registry.h

  • Committer: Continuous Integration
  • Date: 2013-02-28 16:45:31 UTC
  • mfrom: (2622.7.1 remove-more-unireg)
  • Revision ID: ci@drizzle.org-20130228164531-ire1iiu2qbdj8lvm
Merge lp:~stewart/drizzle/remove-more-unireg Build: jenkins-Drizzle-Builder-172

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/module/registry.h
29
29
#include <boost/scoped_ptr.hpp>
30
30
 
31
31
#include <drizzled/gettext.h>
32
 
#include <drizzled/unireg.h>
 
32
#include <drizzled/drizzled_abort.h>
33
33
#include <drizzled/errmsg_print.h>
34
34
#include <drizzled/plugin/plugin.h>
35
35
#include <drizzled/util/find_ptr.h>
102
102
      error_message+= plugin->getTypeName();
103
103
      error_message+= ":";
104
104
      error_message+= plugin->getName();
105
 
      unireg_actual_abort(__FILE__, __LINE__, __func__, error_message);
 
105
      drizzled_actual_abort(__FILE__, __LINE__, __func__, error_message);
106
106
    }
107
107
 
108
108
    if (T::addPlugin(plugin))
112
112
      error_message+= plugin->getTypeName();
113
113
      error_message+= ":";
114
114
      error_message+= plugin->getName();
115
 
      unireg_actual_abort(__FILE__, __LINE__, __func__, error_message);
 
115
      drizzled_actual_abort(__FILE__, __LINE__, __func__, error_message);
116
116
    }
117
117
 
118
118
    if (failed)
119
119
    {
120
 
      unireg_abort << _("Fatal error: Failed initializing: ") << plugin->getTypeName() << ":" << plugin->getName();
 
120
      drizzled_abort << _("Fatal error: Failed initializing: ") << plugin->getTypeName() << ":" << plugin->getName();
121
121
    }
122
122
    plugin_registry.insert(std::make_pair(std::make_pair(plugin_type, plugin_name), plugin));
123
123
  }