Remove some accidentally merged changes.
This commit is contained in:
parent
d8ca58a04e
commit
27d87dff79
@ -55,14 +55,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
|
|
||||||
class Contractor
|
class Contractor
|
||||||
{
|
{
|
||||||
public:
|
|
||||||
struct RemainingNodeData
|
|
||||||
{
|
|
||||||
RemainingNodeData() : id(0), is_independent(false) {}
|
|
||||||
NodeID id : 31;
|
|
||||||
bool is_independent : 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct ContractorEdgeData
|
struct ContractorEdgeData
|
||||||
@ -135,6 +127,13 @@ class Contractor
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct RemainingNodeData
|
||||||
|
{
|
||||||
|
RemainingNodeData() : id(0), is_independent(false) {}
|
||||||
|
NodeID id : 31;
|
||||||
|
bool is_independent : 1;
|
||||||
|
};
|
||||||
|
|
||||||
struct ThreadDataContainer
|
struct ThreadDataContainer
|
||||||
{
|
{
|
||||||
explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
|
explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
|
||||||
|
Loading…
Reference in New Issue
Block a user