commit 9d52bc56fe0d5c104006e40a84b30711cd90d68b
author Lukacs Berki <lberki@google.com> Tue Jun 07 11:11:04 2016 +0000
committer Yun Peng <pcloudy@google.com> Tue Jun 07 12:40:35 2016 +0000
tree 4212d3b68fd39b3d9b6ba95031e0ac4847bed9ee
parent 2d343577434ff31b5200af1f1f8dfa39443a8aaa

Replace override declarations with "virtual" so that we build on Ubuntu 12.04 .

Fixes #1336.

--
MOS_MIGRATED_REVID=124231262

src/main/cpp/blaze.cc

diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index a7dce22..384f9ba 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -247,11 +247,11 @@
   AfUnixBlazeServer();
   virtual ~AfUnixBlazeServer() {}
 
-  bool Connect() override;
-  void Disconnect() override;
-  unsigned int Communicate() override;
-  void KillRunningServer() override;
-  void Cancel() override;
+  virtual bool Connect();
+  virtual void Disconnect();
+  virtual unsigned int Communicate();
+  virtual void KillRunningServer();
+  virtual void Cancel();
 
  private:
   int server_socket_;
@@ -264,11 +264,11 @@
   GrpcBlazeServer();
   virtual ~GrpcBlazeServer();
 
-  bool Connect() override;
-  void Disconnect() override;
-  unsigned int Communicate() override;
-  void KillRunningServer() override;
-  void Cancel() override;
+  virtual bool Connect();
+  virtual void Disconnect();
+  virtual unsigned int Communicate();
+  virtual void KillRunningServer();
+  virtual void Cancel();
 
  private:
   enum CancelThreadAction { NOTHING, JOIN, CANCEL, COMMAND_ID_RECEIVED };

src/main/cpp/blaze_util_mingw.cc

diff --git a/src/main/cpp/blaze_util_mingw.cc b/src/main/cpp/blaze_util_mingw.cc
index ce0b684..fbcbb4e 100644
--- a/src/main/cpp/blaze_util_mingw.cc
+++ b/src/main/cpp/blaze_util_mingw.cc
@@ -295,7 +295,7 @@
  public:
   DummyBlazeServerStartup() {}
   virtual ~DummyBlazeServerStartup() {}
-  bool IsStillAlive() override { return true; }
+  virtual bool IsStillAlive() { return true; }
 };
 
 void ExecuteDaemon(const string& exe, const std::vector<string>& args_vector,

src/main/cpp/blaze_util_posix.cc

diff --git a/src/main/cpp/blaze_util_posix.cc b/src/main/cpp/blaze_util_posix.cc
index 112731f..625b291 100644
--- a/src/main/cpp/blaze_util_posix.cc
+++ b/src/main/cpp/blaze_util_posix.cc
@@ -103,7 +103,7 @@
  public:
   PipeBlazeServerStartup(int pipe_fd);
   virtual ~PipeBlazeServerStartup();
-  bool IsStillAlive() override;
+  virtual bool IsStillAlive();
 
  private:
   int pipe_fd;