From ba995e7d7a59c0ae1307105e510c4006fb54e9f4 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 11 Aug 2014 17:22:01 +0200
Subject: [PATCH] Remove all warnings; All tests working again
---
bob/io/base/cpp/blitz_array.cpp | 3 +--
bob/io/base/include/bob.io.base/HDF5Types.h | 12 ++++++------
bob/io/base/include/bob.io.base/blitz_array.h | 12 ++++++------
setup.py | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/bob/io/base/cpp/blitz_array.cpp b/bob/io/base/cpp/blitz_array.cpp
index 4ea4a7c..9439a4c 100644
--- a/bob/io/base/cpp/blitz_array.cpp
+++ b/bob/io/base/cpp/blitz_array.cpp
@@ -8,9 +8,8 @@
*/
#define BOB_IO_BASE_MODULE
-#include <stdexcept>
-
#include <bob.io.base/blitz_array.h>
+#include <stdexcept>
bob::io::base::array::blitz_array::blitz_array(boost::shared_ptr<blitz_array> other) {
set(other);
diff --git a/bob/io/base/include/bob.io.base/HDF5Types.h b/bob/io/base/include/bob.io.base/HDF5Types.h
index 81e1b6b..01c5cc5 100644
--- a/bob/io/base/include/bob.io.base/HDF5Types.h
+++ b/bob/io/base/include/bob.io.base/HDF5Types.h
@@ -10,12 +10,6 @@
#ifndef BOB_IO_BASE_HDF5TYPES_H
#define BOB_IO_BASE_HDF5TYPES_H
-#include <vector>
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <blitz/array.h>
-#include <hdf5.h>
-
/**
* Checks if the version of HDF5 installed is greater or equal to some set of
* values. (extracted from hdf5-1.8.7)
@@ -29,6 +23,12 @@
#include <bob.io.base/array.h>
+#include <vector>
+#include <string>
+#include <boost/shared_ptr.hpp>
+#include <blitz/array.h>
+#include <hdf5.h>
+
namespace bob { namespace io { namespace base {
/**
diff --git a/bob/io/base/include/bob.io.base/blitz_array.h b/bob/io/base/include/bob.io.base/blitz_array.h
index 052c30d..f784156 100644
--- a/bob/io/base/include/bob.io.base/blitz_array.h
+++ b/bob/io/base/include/bob.io.base/blitz_array.h
@@ -11,17 +11,17 @@
#ifndef BOB_IO_BASE_BLITZ_ARRAY_H
#define BOB_IO_BASE_BLITZ_ARRAY_H
-#include <stdexcept>
-#include <boost/make_shared.hpp>
-#include <boost/format.hpp>
-#include <blitz/array.h>
+#include <bob.io.base/array.h>
+#include <bob.io.base/array_utils.h>
#include <bob.core/check.h>
#include <bob.core/cast.h>
#include <bob.core/array_copy.h>
-#include <bob.io.base/array.h>
-#include <bob.io.base/array_utils.h>
+#include <stdexcept>
+#include <boost/make_shared.hpp>
+#include <boost/format.hpp>
+#include <blitz/array.h>
namespace bob { namespace io { namespace base { namespace array {
diff --git a/setup.py b/setup.py
index 70f76bf..967e9b5 100644
--- a/setup.py
+++ b/setup.py
@@ -168,9 +168,9 @@ setup(
),
Extension("bob.io.base._library",
[
+ "bob/io/base/cpp/blitz_array.cpp",
"bob/io/base/cpp/TensorFileHeader.cpp",
"bob/io/base/cpp/TensorFile.cpp",
- "bob/io/base/cpp/blitz_array.cpp",
"bob/io/base/cpp/CodecRegistry.cpp",
"bob/io/base/cpp/HDF5Attribute.cpp",
"bob/io/base/cpp/HDF5Dataset.cpp",
--
GitLab