[rhmessaging-commits] rhmessaging commits: r4494 - in store/trunk/cpp/lib: jrnl and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2012-02-17 07:12:24 -0500 (Fri, 17 Feb 2012)
New Revision: 4494

Modified:
   store/trunk/cpp/lib/DataTokenImpl.h
   store/trunk/cpp/lib/TxnCtxt.h
   store/trunk/cpp/lib/jrnl/fcntl.cpp
   store/trunk/cpp/lib/jrnl/jdir.cpp
Log:
Fixes for some Rawhide compile errors (gcc 4.7)

Modified: store/trunk/cpp/lib/DataTokenImpl.h
===================================================================
--- store/trunk/cpp/lib/DataTokenImpl.h	2012-02-15 15:58:36 UTC (rev 4493)
+++ store/trunk/cpp/lib/DataTokenImpl.h	2012-02-17 12:12:24 UTC (rev 4494)
@@ -25,8 +25,8 @@
 #define _DataTokenImpl_
 
 #include "jrnl/data_tok.hpp"
+#include <qpid/broker/PersistableMessage.h>
 #include <boost/intrusive_ptr.hpp>
-#include <qpid/broker/PersistableMessage.h>
 
 namespace mrg {
 namespace msgstore {

Modified: store/trunk/cpp/lib/TxnCtxt.h
===================================================================
--- store/trunk/cpp/lib/TxnCtxt.h	2012-02-15 15:58:36 UTC (rev 4493)
+++ store/trunk/cpp/lib/TxnCtxt.h	2012-02-17 12:12:24 UTC (rev 4494)
@@ -24,7 +24,6 @@
 #ifndef _TxnCtxt_
 #define _TxnCtxt_
 
-#include <boost/intrusive_ptr.hpp>
 #include <db-inc.h>
 #include <memory>
 #include <set>
@@ -38,6 +37,8 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/uuid.h"
 
+#include <boost/intrusive_ptr.hpp>
+
 namespace mrg {
 namespace msgstore {
 

Modified: store/trunk/cpp/lib/jrnl/fcntl.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/fcntl.cpp	2012-02-15 15:58:36 UTC (rev 4493)
+++ store/trunk/cpp/lib/jrnl/fcntl.cpp	2012-02-17 12:12:24 UTC (rev 4494)
@@ -39,6 +39,7 @@
 #include "jrnl/jerrno.hpp"
 #include "jrnl/jexception.hpp"
 #include <sstream>
+#include <unistd.h>
 
 namespace mrg
 {

Modified: store/trunk/cpp/lib/jrnl/jdir.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/jdir.cpp	2012-02-15 15:58:36 UTC (rev 4493)
+++ store/trunk/cpp/lib/jrnl/jdir.cpp	2012-02-17 12:12:24 UTC (rev 4494)
@@ -42,6 +42,7 @@
 #include "jrnl/jexception.hpp"
 #include <sstream>
 #include <sys/stat.h>
+#include <unistd.h>
 
 namespace mrg
 {