← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/server_detect.h

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/server_detect.h
20
20
 
21
21
#pragma once
22
22
 
23
 
#include <boost/regex.hpp>
24
 
#include <iosfwd>
 
23
#include <string>
25
24
 
26
25
class ServerDetect
27
26
{
28
 
  public:
29
 
    enum server_type {
30
 
      SERVER_MYSQL_FOUND,
31
 
      SERVER_DRIZZLE_FOUND,
32
 
      SERVER_UNKNOWN_FOUND
33
 
    };
34
 
 
35
 
    server_type getServerType() { return type; }
36
 
    std::string& getServerVersion() { return version; }
37
 
 
38
 
    ServerDetect(drizzle_con_st *connection);
39
 
 
40
 
  private:
41
 
    server_type type;
42
 
    std::string version;
 
27
public:
 
28
  enum server_type 
 
29
  {
 
30
    SERVER_MYSQL_FOUND,
 
31
    SERVER_DRIZZLE_FOUND,
 
32
    SERVER_UNKNOWN_FOUND
 
33
  };
 
34
 
 
35
  server_type getServerType() const { return type; }
 
36
  const std::string& getServerVersion() const { return version; }
 
37
 
 
38
  ServerDetect(drizzle_con_st*);
 
39
 
 
40
private:
 
41
  server_type type;
 
42
  std::string version;
43
43
};