← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/json_server/json_server.cc

  • Committer: Mark Atwood
  • Date: 2011-08-17 19:14:47 UTC
  • mfrom: (2385.3.17 rf)
  • Revision ID: me@mark.atwood.name-20110817191447-h86yzddvycd0xmof
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/json_server/json_server.cc
32
32
#include <drizzled/sys_var.h>
33
33
#include <drizzled/gettext.h>
34
34
#include <drizzled/error.h>
35
 
#include <drizzled/query_id.h>
36
35
#include <drizzled/session.h>
37
36
#include <drizzled/internal/my_sys.h>
38
37
#include <drizzled/internal/m_string.h>
247
246
class JsonServer : public drizzled::plugin::Daemon
248
247
{
249
248
private:
250
 
  JsonServer(const JsonServer &);
251
 
  JsonServer& operator=(const JsonServer &);
252
 
 
253
249
  drizzled::thread_ptr json_thread;
254
250
  in_port_t _port;
255
251
  struct evhttp *httpd;