← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/errmsg_notify/errmsg_notify.cc

[patch 003/129] Merge patch for revision 1788 from InnoDB SVN:
revno: 1788
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5670
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5663
committer: marko
timestamp: Wed 2009-08-12 12:16:37 +0000
message:
  branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec.
  This is a non-functional change.
modified:
  include/trx0rec.h              2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0rec.h
  include/trx0rec.ic             2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0rec.ic
  trx/trx0rec.c                  2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0rec.c
diff:
=== modified file 'include/trx0rec.h'

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/errmsg_notify/errmsg_notify.cc
22
22
#include <cstdio>  /* for vsnprintf */
23
23
#include <stdarg.h>  /* for va_list */
24
24
#include <unistd.h>  /* for write(2) */
25
 
#include <iostream>
26
25
#include <libnotifymm.h>
27
 
#include <boost/scoped_ptr.hpp>
28
26
 
29
27
#include <string>
30
28
#include <vector>
38
36
#define MAX_MSG_LEN 8192
39
37
 
40
38
using namespace drizzled;
 
39
using namespace std;
 
40
 
41
41
 
42
42
class Error_message_notify : public plugin::ErrorMessage
43
43
{
44
 
  std::vector<std::string> errmsg_tags;
 
44
  vector<string> errmsg_tags;
45
45
public:
46
46
  Error_message_notify()
47
47
   : plugin::ErrorMessage("Error_message_notify"),
73
73
    {
74
74
      if (!n.show())
75
75
#else
76
 
      boost::scoped_ptr<Glib::Error> error;
 
76
      auto_ptr<Glib::Error> error;
77
77
      if (!n.show(error))
78
78
#endif
79
79
      {
80
 
        std::cerr << _("Failed to send error message to libnotify\n");
 
80
        fprintf(stderr, _("Failed to send error message to libnotify\n"));
81
81
        return true;
82
82
      }
83
83
#ifdef GLIBMM_EXCEPTIONS_ENABLED
84
84
     }
85
85
     catch (Glib::Error& err)
86
86
     {
87
 
       std::cerr << err.what() << std::endl;
 
87
        fprintf(stderr, err.what().c_str());
88
88
     }
89
89
#endif
90
90