Skip to content

Ensure everything compiles individually & sort includes #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Ensure everything compiles individually & sort includes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libsnark/common/data_structures/accumulation_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#ifndef ACCUMULATION_VECTOR_HPP_
#define ACCUMULATION_VECTOR_HPP_

#include <iostream>

#include <libsnark/common/data_structures/sparse_vector.hpp>

namespace libsnark {
Expand Down
4 changes: 2 additions & 2 deletions libsnark/common/data_structures/integer_permutation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) :
Expand Down
1 change: 1 addition & 0 deletions libsnark/common/data_structures/merkle_tree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <map>
#include <vector>

#include <libff/common/utils.hpp>

namespace libsnark {
Expand Down
3 changes: 2 additions & 1 deletion libsnark/common/data_structures/set_commitment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions libsnark/common/data_structures/set_commitment.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions libsnark/common/data_structures/sparse_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#ifndef SPARSE_VECTOR_HPP_
#define SPARSE_VECTOR_HPP_

#include <iostream>
#include <vector>

namespace libsnark {
Expand Down
4 changes: 2 additions & 2 deletions libsnark/common/data_structures/sparse_vector.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <vector>

#include <libff/common/utils.hpp>

#include <libsnark/common/data_structures/integer_permutation.hpp>

namespace libsnark {
Expand Down
3 changes: 2 additions & 1 deletion libsnark/common/routing_algorithms/benes_routing_algorithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

/**
Expand Down
3 changes: 2 additions & 1 deletion libsnark/common/routing_algorithms/benes_routing_algorithm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

/**
Expand Down
1 change: 1 addition & 0 deletions libsnark/common/routing_algorithms/profiling/profile_routing_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <algorithm>

#include <libff/common/profiling.hpp>

#include <libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp>
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>

Expand Down
3 changes: 2 additions & 1 deletion libsnark/common/routing_algorithms/tests/test_routing_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
#include <cassert>

#include <libff/common/profiling.hpp>
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>

#include <libsnark/common/routing_algorithms/as_waksman_routing_algorithm.hpp>
#include <libsnark/common/routing_algorithms/benes_routing_algorithm.hpp>

using namespace libsnark;

Expand Down
3 changes: 2 additions & 1 deletion libsnark/gadgetlib1/constraint_profiling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libsnark/gadgetlib1/constraint_profiling.hpp>
#include <libff/common/profiling.hpp>

#include <libsnark/gadgetlib1/constraint_profiling.hpp>

namespace libsnark {

size_t constraint_profiling_indent = 0;
Expand Down
8 changes: 4 additions & 4 deletions libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/examples/test_fooram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* and contributors (see AUTHORS).
* @copyright MIT license (see LICENSE file)
*****************************************************************************/
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include <libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp>
#include <libff/common/utils.hpp>
#include <libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp>
#include <libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp>

#include <libsnark/common/default_types/r1cs_ppzkpcd_pp.hpp>
#include <libsnark/common/default_types/r1cs_ppzksnark_pp.hpp>
#include <libsnark/relations/ram_computations/rams/fooram/fooram_params.hpp>
#include <libsnark/zk_proof_systems/ppzksnark/ram_ppzksnark/examples/run_ram_ppzksnark.hpp>
#include <libsnark/zk_proof_systems/zksnark/ram_zksnark/examples/run_ram_zksnark.hpp>

namespace libsnark {

Expand Down
3 changes: 2 additions & 1 deletion libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/fooram_cpu_checker.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@
#include <memory>

#include <libff/common/serialization.hpp>

#include <libsnark/gadgetlib1/gadget.hpp>
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/bar_gadget.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/fooram/components/fooram_protoboard.hpp>
#include <libsnark/relations/ram_computations/memory/memory_interface.hpp>

namespace libsnark {
Expand Down
3 changes: 2 additions & 1 deletion libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_arithmetic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
#define ALU_ARITHMETIC_HPP_
#include <memory>

#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp>

namespace libsnark {

Expand Down
3 changes: 2 additions & 1 deletion libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/alu_control_flow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
#ifndef ALU_CONTROL_FLOW_HPP_
#define ALU_CONTROL_FLOW_HPP_

#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
#include <libsnark/gadgetlib1/gadgets/basic_gadgets.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>
#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/word_variable_gadget.hpp>

namespace libsnark {

Expand Down
2 changes: 2 additions & 0 deletions libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/argument_decoder_gadget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#ifndef ARGUMENT_DECODER_GADGET_HPP_
#define ARGUMENT_DECODER_GADGET_HPP_

#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>

namespace libsnark {

template<typename FieldT>
Expand Down
2 changes: 2 additions & 0 deletions libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/consistency_enforcer_gadget.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#ifndef CONSISTENCY_ENFORCER_GADGET_HPP_
#define CONSISTENCY_ENFORCER_GADGET_HPP_

#include <libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/tinyram_protoboard.hpp>

namespace libsnark {

template<typename FieldT>
Expand Down
58 changes: 0 additions & 58 deletions libsnark/gadgetlib1/gadgets/cpu_checkers/tinyram/components/instruction_packing_gadget.hpp
View file
Open in desktop

This file was deleted.

Loading