From: Thies Jochimsen <thies@jochimsen.de>
Subject: Add missing header for GCC 4.7

Bug-Debian: http://bugs.debian.org/667307

--- a/tjutils/tjthread.cpp
+++ b/tjutils/tjthread.cpp
@@ -9,6 +9,9 @@
 
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h> // for sysconf
+#endif
 #define USE_PTHREADS
 #endif
 
--- a/tjutils/tjembed.h
+++ b/tjutils/tjembed.h
@@ -19,6 +19,7 @@
 #define TJEMBED_H
 
 #include <tjutils/tjutils.h>
+#include <tjutils/tjstring.h> // for itos
 
 /**
   * @addtogroup tjutils
--- a/odindata/data.h
+++ b/odindata/data.h
@@ -207,7 +207,7 @@
   template<class T_expr>
   inline Data<T,N_rank>& operator = (BZ_ETPARM(_bz_ArrayExpr<T_expr>) expr) {
     typedef _bz_typename T_expr::T_numtype T_numtype;
-    evaluate(expr, _bz_update<T_numtype, _bz_typename T_expr::T_numtype>());
+    this->evaluate(expr, _bz_update<T_numtype, _bz_typename T_expr::T_numtype>());
     return *this;
   }
 
@@ -516,7 +516,7 @@
     ODINLOG(odinlog,normalDebug) << "nn(pad)" << nn << STD_endl;
     TinyVector<int,N_rank> tv;
     for(unsigned int i=0; i<N_rank; i++) tv(i)=nn[i];
-    resize(tv);
+    this->resize(tv);
     for(unsigned int i=0;i<a.total();i++) (*this)(create_index(i))=a[i];
   } else ODINLOG(odinlog,errorLog) << "dimension mismatch: this=" << N_rank<< " < tjarray=" << a.dim() << STD_endl;
   return *this;
@@ -883,7 +883,7 @@
 
   TinyVector<int,N_rank> newshape(oldshape);
   newshape(dim)=newsize;
-  resize(newshape);
+  this->resize(newshape);
 
   // This holds the the shape of the subspace which is orthogonal to direction 'dim'
   TinyVector<int,N_rank> ortho_shape(oldshape);
--- a/odindata/complexdata.h
+++ b/odindata/complexdata.h
@@ -108,7 +108,7 @@
   template<class T_expr>
   inline ComplexData<N_rank>& operator = (BZ_ETPARM(_bz_ArrayExpr<T_expr>) expr) {
     typedef _bz_typename T_expr::T_numtype T_numtype;
-    evaluate(expr, _bz_update<T_numtype, _bz_typename T_expr::T_numtype>());
+    this->evaluate(expr, _bz_update<T_numtype, _bz_typename T_expr::T_numtype>());
     return *this;
   }
 
@@ -277,7 +277,7 @@
     for(int irank=0; irank<N_rank; irank++) {
       if(do_fft(irank)) {
         ODINLOG(odinlog,normalDebug) << "Cyclic shift in dim=" << irank << STD_endl;
-        shift(irank,cyclshift(irank));
+        this->shift(irank,cyclshift(irank));
       }
     }
   }
