Skip to content
Browse files

fix gcc 4.4 incompatiblities

git-svn-id: http://kazuho.31tools.com/svn/incline/trunk@269 4d3e2a30-9d6d-0410-bc8c-dac56cff10b3
  • Loading branch information...
1 parent bc199e5 commit cb9bffff7e81d32695066f8fe22eadddf6bf2637 kazuho committed Mar 1, 2010
Showing with 5 additions and 6 deletions.
  1. +1 −0 src/getoptpp.h
  2. +3 −5 src/incline_fw_replicator.h
  3. +0 −1 src/incline_mysql.h
  4. +1 −0 src/incline_util.cc
View
1 src/getoptpp.h
@@ -6,6 +6,7 @@ extern "C" {
}
#include <algorithm>
#include <cassert>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <iostream>
View
8 src/incline_fw_replicator.h
@@ -10,11 +10,9 @@ class incline_fw_replicator : public incline_fw {
class manager : public super::manager {
public:
- typedef super::manager super;
- public:
- manager(incline_driver_sharded* driver, int poll_interval, FILE* log_fh) : super(driver, poll_interval, log_fh) {}
- const incline_driver_sharded* driver() const { return static_cast<const incline_driver_sharded*>(super::driver()); }
- incline_driver_sharded* driver() { return static_cast<incline_driver_sharded*>(super::driver()); }
+ manager(incline_driver_sharded* driver, int poll_interval, FILE* log_fh) : super::manager(driver, poll_interval, log_fh) {}
+ const incline_driver_sharded* driver() const { return static_cast<const incline_driver_sharded*>(super::manager::driver()); }
+ incline_driver_sharded* driver() { return static_cast<incline_driver_sharded*>(super::manager::driver()); }
void start(std::vector<pthread_t>& threads);
};
View
1 src/incline_mysql.h
@@ -11,7 +11,6 @@ class incline_mysql : public incline_dbms {
public:
typedef incline_dbms super;
struct factory : public super::factory {
- typedef super::factory super;
virtual ~factory() {}
virtual incline_mysql* create(const std::string& host, unsigned short port, const std::string& user, const std::string& password);
virtual unsigned short default_port() const { return 3306; }
View
1 src/incline_util.cc
@@ -1,5 +1,6 @@
#include <cassert>
#include <cstdarg>
+#include <cstdio>
#include "incline_util.h"
#ifdef WIN32
# include "incline_win32.h"

0 comments on commit cb9bfff

Please sign in to comment.
Something went wrong with that request. Please try again.