Merge lp:~flameeyes/gearmand/gcc47 into lp:gearmand/1.0

[Diego Elio Pettenò]

This is a fix for the GCC 4.7 building bug I reported.

[Clint Byrum (clint-fewbar)]

Diego, thanks for the submission, it looks good to me.

I wonder if we have any GCC 4.7 targets in our CI system. Seems like we should add Ubuntu quantal and maybe Debian wheezy since they default to 4.7.

I'll let Brian do the merge, as I think I'd like to also make sure we're actually testing against 4.7 before going any further.

review: Approve

[Clint Byrum (clint-fewbar)]

Actually it looks like Brian beat you to the punch a couple days ago:

revno: 578
committer: Brian Aker <email address hidden>
branch nick: gearmand-build
timestamp: Mon 2012-06-18 10:47:16 -0400
message:
  Update required include.
=== modified file 'util/logfile.cc'
--- util/logfile.cc 2012-04-28 08:01:43 +0000
+++ util/logfile.cc 2012-06-18 14:47:16 +0000
@@ -49,6 +49,7 @@
 #include <sstream>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>

 namespace datadifferential {
 namespace util {

[Diego Elio Pettenò (flameeyes)]

Why do I not see it when I branch trunk?

--
Diego Elio Pettenò

[Clint Byrum (clint-fewbar)]

Excerpts from flameeyes's message of 2012-06-21 16:43:19 UTC:
> Why do I not see it when I branch trunk?
>

Its in lp:gearmand/build .. which is where things go to be CI tested
before merge into trunk.

=== modified file 'util/logfile.cc'
--- util/logfile.cc	2012-04-28 08:01:43 +0000
+++ util/logfile.cc	2012-06-21 15:03:28 +0000
@@ -49,6 +49,7 @@
 #include <sstream>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <unistd.h>
 
 namespace datadifferential {
 namespace util {