Merge pull request #79 from popoffka/sort-includes

Ensure everything compiles individually & sort includes

Author: madars

libsnark/common/data_structures/accumulation_vector.hpp

@@ -12,6 +12,8 @@
 #ifndef ACCUMULATION_VECTOR_HPP_
 #define ACCUMULATION_VECTOR_HPP_
 
+#include <iostream>
+
 #include <libsnark/common/data_structures/sparse_vector.hpp>
 
 namespace libsnark {

libsnark/common/data_structures/integer_permutation.cpp

@@ -11,13 +11,13 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libsnark/common/data_structures/integer_permutation.hpp>
-
 #include <algorithm>
 #include <cassert>
 #include <numeric>
 #include <unordered_set>
 
+#include <libsnark/common/data_structures/integer_permutation.hpp>
+
 namespace libsnark {
 
 integer_permutation::integer_permutation(const size_t size) :

libsnark/common/data_structures/merkle_tree.hpp

@@ -14,6 +14,7 @@
 
 #include <map>
 #include <vector>
+
 #include <libff/common/utils.hpp>
 
 namespace libsnark {

libsnark/common/data_structures/set_commitment.cpp

@@ -5,9 +5,10 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libsnark/common/data_structures/set_commitment.hpp>
 #include <libff/common/serialization.hpp>
 
+#include <libsnark/common/data_structures/set_commitment.hpp>
+
 namespace libsnark {
 
 bool set_membership_proof::operator==(const set_membership_proof &other) const

libsnark/common/data_structures/set_commitment.hpp

@@ -13,6 +13,7 @@
 #define SET_COMMITMENT_HPP_
 
 #include <libff/common/utils.hpp>
+
 #include <libsnark/common/data_structures/merkle_tree.hpp>
 #include <libsnark/gadgetlib1/gadgets/hashes/hash_io.hpp> // TODO: the current structure is suboptimal
 

libsnark/common/data_structures/sparse_vector.hpp

@@ -12,6 +12,7 @@
 #ifndef SPARSE_VECTOR_HPP_
 #define SPARSE_VECTOR_HPP_
 
+#include <iostream>
 #include <vector>
 
 namespace libsnark {

libsnark/common/data_structures/sparse_vector.tcc

@@ -14,10 +14,10 @@
 #ifndef SPARSE_VECTOR_TCC_
 #define SPARSE_VECTOR_TCC_
 
-#include <libff/algebra/scalar_multiplication/multiexp.hpp>
-
 #include <numeric>
 
+#include <libff/algebra/scalar_multiplication/multiexp.hpp>
+
 namespace libsnark {
 
 template<typename T>

libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp

@@ -43,6 +43,7 @@
 #include <vector>
 
 #include <libff/common/utils.hpp>
+
 #include <libsnark/common/data_structures/integer_permutation.hpp>
 
 namespace libsnark {

libsnark/common/routing_algorithms/benes_routing_algorithm.cpp

@@ -11,9 +11,10 @@
  * @copyright  MIT license (see LICENSE file)
  *****************************************************************************/
 
-#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
 #include <cassert>
 
+#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>
+
 namespace libsnark {
 
 /**

libsnark/common/routing_algorithms/benes_routing_algorithm.hpp

@@ -27,9 +27,10 @@
 
 #include <vector>
 
-#include <libsnark/common/data_structures/integer_permutation.hpp>
 #include <libff/common/utils.hpp>
 
+#include <libsnark/common/data_structures/integer_permutation.hpp>
+
 namespace libsnark {
 
 /**