Skip to content

Ensure everything compiles individually & sort includes #9

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 2 commits into from
Jun 27, 2017
Merged

Ensure everything compiles individually & sort includes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a44f482
Add missing includes & sort all includes.
aleksejspopovs Jun 22, 2017
95c05af
Refuse to compile when curve not selected.
aleksejspopovs Jun 22, 2017
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
1 change: 1 addition & 0 deletions libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef ALT_BN128_G1_HPP_
#define ALT_BN128_G1_HPP_
#include <vector>

#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/curve_utils.hpp>

Expand Down
1 change: 1 addition & 0 deletions libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef ALT_BN128_G2_HPP_
#define ALT_BN128_G2_HPP_
#include <vector>

#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/curve_utils.hpp>

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/alt_bn128/alt_bn128_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/alt_bn128/alt_bn128_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#define ALT_BN128_INIT_HPP_
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/fields/fp.hpp>
#include <libff/algebra/fields/fp12_2over3over2.hpp>
#include <libff/algebra/fields/fp2.hpp>
#include <libff/algebra/fields/fp6_3over2.hpp>
#include <libff/algebra/fields/fp12_2over3over2.hpp>

namespace libff {

Expand Down
7 changes: 4 additions & 3 deletions libff/algebra/curves/alt_bn128/alt_bn128_pairing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <cassert>

#include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
#include <cassert>
#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
#include <libff/common/profiling.hpp>

namespace libff {
Expand Down
1 change: 1 addition & 0 deletions libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef ALT_BN128_PAIRING_HPP_
#define ALT_BN128_PAIRING_HPP_
#include <vector>

#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>

namespace libff {
Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

#ifndef ALT_BN128_PP_HPP_
#define ALT_BN128_PP_HPP_
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_g1.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_g2.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_init.hpp>
#include <libff/algebra/curves/alt_bn128/alt_bn128_pairing.hpp>
#include <libff/algebra/curves/public_params.hpp>

namespace libff {

Expand Down
4 changes: 3 additions & 1 deletion libff/algebra/curves/bn128/bn128_g1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
#ifndef BN128_G1_HPP_
#define BN128_G1_HPP_
#include <vector>

#include "third_party/ate-pairing/include/bn.h"

#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/curve_utils.hpp>
#include "third_party/ate-pairing/include/bn.h"

namespace libff {

Expand Down
4 changes: 3 additions & 1 deletion libff/algebra/curves/bn128/bn128_g2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
#define BN128_G2_HPP_
#include <iostream>
#include <vector>

#include "third_party/ate-pairing/include/bn.h"

#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/curve_utils.hpp>
#include "third_party/ate-pairing/include/bn.h"

namespace libff {

Expand Down
6 changes: 4 additions & 2 deletions libff/algebra/curves/bn128/bn128_gt.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@

#ifndef BN128_GT_HPP_
#define BN128_GT_HPP_
#include <libff/algebra/fields/fp.hpp>
#include <libff/algebra/fields/field_utils.hpp>
#include <iostream>

#include "third_party/ate-pairing/include/bn.h"

#include <libff/algebra/fields/field_utils.hpp>
#include <libff/algebra/fields/fp.hpp>

namespace libff {

class bn128_GT;
Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/bn128/bn128_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/bn128/bn128_g1.hpp>
#include <libff/algebra/curves/bn128/bn128_g2.hpp>
#include <libff/algebra/curves/bn128/bn128_gt.hpp>
#include <libff/algebra/curves/bn128/bn128_init.hpp>

namespace libff {

Expand Down
3 changes: 2 additions & 1 deletion libff/algebra/curves/bn128/bn128_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

#ifndef BN128_INIT_HPP_
#define BN128_INIT_HPP_
#include "third_party/ate-pairing/include/bn.h"

#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/fields/fp.hpp>
#include "third_party/ate-pairing/include/bn.h"

namespace libff {

Expand Down
6 changes: 3 additions & 3 deletions libff/algebra/curves/bn128/bn128_pairing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#include <sstream>

#include <libff/algebra/curves/bn128/bn128_pairing.hpp>
#include <libff/common/profiling.hpp>
#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/bn128/bn128_g1.hpp>
#include <libff/algebra/curves/bn128/bn128_g2.hpp>
#include <libff/algebra/curves/bn128/bn128_gt.hpp>
#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/bn128/bn128_pairing.hpp>
#include <libff/common/profiling.hpp>

namespace libff {

Expand Down
3 changes: 2 additions & 1 deletion libff/algebra/curves/bn128/bn128_pairing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@

#ifndef BN128_PAIRING_HPP_
#define BN128_PAIRING_HPP_
#include "third_party/ate-pairing/include/bn.h"

#include <libff/algebra/curves/bn128/bn128_g1.hpp>
#include <libff/algebra/curves/bn128/bn128_g2.hpp>
#include <libff/algebra/curves/bn128/bn128_gt.hpp>
#include "third_party/ate-pairing/include/bn.h"

namespace libff {

Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/bn128/bn128_pp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#ifndef BN128_PP_HPP_
#define BN128_PP_HPP_
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/bn128/bn128_g1.hpp>
#include <libff/algebra/curves/bn128/bn128_g2.hpp>
#include <libff/algebra/curves/bn128/bn128_gt.hpp>
#include <libff/algebra/curves/bn128/bn128_init.hpp>
#include <libff/algebra/curves/bn128/bn128_pairing.hpp>
#include <libff/algebra/curves/public_params.hpp>

namespace libff {

Expand Down
1 change: 1 addition & 0 deletions libff/algebra/curves/bn128/bn_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef BN_UTILS_HPP_
#define BN_UTILS_HPP_
#include <vector>

#include "third_party/ate-pairing/include/bn.h"

namespace libff {
Expand Down
3 changes: 2 additions & 1 deletion libff/algebra/curves/edwards/edwards_g1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
#ifndef EDWARDS_G1_HPP_
#define EDWARDS_G1_HPP_
#include <vector>
#include <libff/algebra/curves/edwards/edwards_init.hpp>

#include <libff/algebra/curves/curve_utils.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>

namespace libff {

Expand Down
3 changes: 2 additions & 1 deletion libff/algebra/curves/edwards/edwards_g2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
#define EDWARDS_G2_HPP_
#include <iostream>
#include <vector>
#include <libff/algebra/curves/edwards/edwards_init.hpp>

#include <libff/algebra/curves/curve_utils.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/edwards/edwards_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/edwards/edwards_init.hpp>
#include <libff/algebra/curves/edwards/edwards_g1.hpp>
#include <libff/algebra/curves/edwards/edwards_g2.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>

namespace libff {

Expand Down
5 changes: 3 additions & 2 deletions libff/algebra/curves/edwards/edwards_pairing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/edwards/edwards_pairing.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>
#include <cassert>

#include <libff/algebra/curves/edwards/edwards_g1.hpp>
#include <libff/algebra/curves/edwards/edwards_g2.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>
#include <libff/algebra/curves/edwards/edwards_pairing.hpp>
#include <libff/common/profiling.hpp>

namespace libff {
Expand Down
1 change: 1 addition & 0 deletions libff/algebra/curves/edwards/edwards_pairing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#ifndef EDWARDS_PAIRING_HPP_
#define EDWARDS_PAIRING_HPP_
#include <vector>

#include <libff/algebra/curves/edwards/edwards_init.hpp>

namespace libff {
Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/edwards/edwards_pp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

#ifndef EDWARDS_PP_HPP_
#define EDWARDS_PP_HPP_
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>
#include <libff/algebra/curves/edwards/edwards_g1.hpp>
#include <libff/algebra/curves/edwards/edwards_g2.hpp>
#include <libff/algebra/curves/edwards/edwards_init.hpp>
#include <libff/algebra/curves/edwards/edwards_pairing.hpp>
#include <libff/algebra/curves/public_params.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/mnt/mnt4/mnt4_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/mnt/mnt4/mnt4_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef MNT4_INIT_HPP_
#define MNT4_INIT_HPP_

#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/mnt/mnt46_common.hpp>
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/fields/fp.hpp>
#include <libff/algebra/fields/fp2.hpp>
#include <libff/algebra/fields/fp4.hpp>
Expand Down
5 changes: 2 additions & 3 deletions libff/algebra/curves/mnt/mnt4/mnt4_pairing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@

#include <cassert>

#include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>

#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>
#include <libff/algebra/scalar_multiplication/wnaf.hpp>
#include <libff/common/profiling.hpp>

Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
#ifndef MNT4_PP_HPP_
#define MNT4_PP_HPP_

#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g1.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_g2.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_init.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_pairing.hpp>
#include <libff/algebra/curves/public_params.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/mnt/mnt6/mnt6_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @copyright MIT license (see LICENSE file)
*****************************************************************************/

#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/mnt/mnt6/mnt6_init.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#ifndef MNT6_INIT_HPP_
#define MNT6_INIT_HPP_

#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/mnt/mnt46_common.hpp>
#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/fields/fp.hpp>
#include <libff/algebra/fields/fp3.hpp>
#include <libff/algebra/fields/fp6_2over3.hpp>
Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/mnt/mnt6/mnt6_pairing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

#include <cassert>

#include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
#include <libff/algebra/scalar_multiplication/wnaf.hpp>
#include <libff/common/profiling.hpp>

Expand Down
4 changes: 2 additions & 2 deletions libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
#ifndef MNT6_PP_HPP_
#define MNT6_PP_HPP_

#include <libff/algebra/curves/public_params.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g1.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_g2.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_init.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_pairing.hpp>
#include <libff/algebra/curves/public_params.hpp>

namespace libff {

Expand Down
2 changes: 1 addition & 1 deletion libff/algebra/curves/tests/test_bilinearity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* and contributors (see AUTHORS).
* @copyright MIT license (see LICENSE file)
*****************************************************************************/
#include <libff/common/profiling.hpp>
#include <libff/algebra/curves/edwards/edwards_pp.hpp>
#include <libff/common/profiling.hpp>
#ifdef CURVE_BN128
#include <libff/algebra/curves/bn128/bn128_pp.hpp>
#endif
Expand Down
5 changes: 3 additions & 2 deletions libff/algebra/curves/tests/test_groups.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
* and contributors (see AUTHORS).
* @copyright MIT license (see LICENSE file)
*****************************************************************************/
#include <libff/common/profiling.hpp>
#include <libff/algebra/curves/edwards/edwards_pp.hpp>
#include <libff/algebra/curves/mnt/mnt4/mnt4_pp.hpp>
#include <libff/algebra/curves/mnt/mnt6/mnt6_pp.hpp>
#include <libff/common/profiling.hpp>
#ifdef CURVE_BN128
#include <libff/algebra/curves/bn128/bn128_pp.hpp>
#endif
#include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>
#include <sstream>

#include <libff/algebra/curves/alt_bn128/alt_bn128_pp.hpp>

using namespace libff;

template<typename GroupT>
Expand Down
Loading