Skip to content

Commit 92bc473

Browse files
[Github] Fix issues on codefactor (#141)
* Update Template_Markdown.md * Update Generator_toc.yml * Update Generator_toc.yml * Update Generator_toc.yml * Revert "Update Template_Markdown.md" This reverts commit 6de8f3a. * Update TOC (#137) * Update the table of contents * Update the table of contents * Update VS_linter.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Installation_guide.md * Update Installation_Times_for_Gun_Mods.md * Update Learning_Code.md * Update Override_a_variable.md * Update Updating_Legacy_JSON.md * Update VS_linter.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Generator_toc.yml * Update .typo-ci.yml Co-authored-by: TheGoatGod <TheGoatGod@users.noreply.github.com> Co-authored-by: TheGoatGod <xXMartinDXx@gmail.com> Co-authored-by: TheGoatGod <56883303+TheGoatGod@users.noreply.github.com> * Update Generator_toc.yml * Update Template_Markdown.md * Update Generator_toc.yml * Revert "Update Template_Markdown.md" This reverts commit af5b1ce. * Update Generator_toc.yml * rename the no starter kit * Update Generator_toc.yml * Revert "Revert "Update Template_Markdown.md"" This reverts commit 8f5851f. * Update Generator_toc.yml * Update TOC (#138) * Update the table of contents * Update the table of contents * Update VS_linter.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Installation_guide.md * Update Installation_Times_for_Gun_Mods.md * Update Learning_Code.md * Update Override_a_variable.md * Update Updating_Legacy_JSON.md * Update VS_linter.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Generator_toc.yml * Update Professions_catalogue.md * Update Generator_toc.yml * Update .typo-ci.yml * Update TOC * remove generated with in mds * remove generated with in mds Co-authored-by: TheGoatGod <TheGoatGod@users.noreply.github.com> Co-authored-by: TheGoatGod <xXMartinDXx@gmail.com> Co-authored-by: TheGoatGod <56883303+TheGoatGod@users.noreply.github.com> * Update TOC (#139) * Update TOC * remove generated with from md Co-authored-by: TheGoatGod <TheGoatGod@users.noreply.github.com> Co-authored-by: TheGoatGod <xXMartinDXx@gmail.com> Co-authored-by: TheGoatGod <56883303+TheGoatGod@users.noreply.github.com> * Update README.md * Update README.md * remove white space * Update colony.h * Update cata_utility.h * Update game.h * Update string_id.h Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheGoatGod <TheGoatGod@users.noreply.github.com>
1 parent 79f251f commit 92bc473

File tree

4 files changed

+1
-24
lines changed

4 files changed

+1
-24
lines changed

src/cata_utility.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ struct pair_greater_cmp_first {
2424
bool operator()( const std::pair<T, U> &a, const std::pair<T, U> &b ) const {
2525
return a.first > b.first;
2626
}
27-
2827
};
2928

3029
/**

src/colony.h

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ class colony : private element_allocator_type
104104
friend class colony_reverse_iterator<true>;
105105

106106
private:
107-
108107
struct group; // forward declaration for typedefs below
109108

110109
using aligned_element_allocator_type = typename
@@ -191,7 +190,6 @@ class colony : private element_allocator_type
191190
};
192191

193192
public:
194-
195193
// Iterators:
196194
template <bool is_const> class colony_iterator
197195
{
@@ -311,7 +309,6 @@ class colony : private element_allocator_type
311309
}
312310

313311
public:
314-
315312
colony_iterator &operator--() {
316313
assert( group_pointer != nullptr );
317314
assert( !( element_pointer == group_pointer->elements &&
@@ -389,7 +386,6 @@ class colony : private element_allocator_type
389386
element_pointer( element_p ), skipfield_pointer( skipfield_p ) {}
390387

391388
public:
392-
393389
inline colony_iterator( const colony_iterator &source ) noexcept:
394390
group_pointer( source.group_pointer ),
395391
element_pointer( source.element_pointer ),
@@ -571,18 +567,15 @@ class colony : private element_allocator_type
571567
it( group_p, element_p, skipfield_p ) {}
572568

573569
public:
574-
575570
// move constructors
576571
colony_reverse_iterator( colony_reverse_iterator &&source ) noexcept:
577572
it( std::move( source.it ) ) {}
578573

579574
colony_reverse_iterator( typename colony::iterator &&source ) noexcept:
580575
it( std::move( source ) ) {}
581-
582576
}; // colony_reverse_iterator
583577

584578
private:
585-
586579
// Used to prevent fill-insert/constructor calls being mistakenly resolved to range-insert/constructor calls
587580
template <bool condition, class T = void>
588581
struct enable_if_c {
@@ -613,7 +606,6 @@ class colony : private element_allocator_type
613606
} group_allocator_pair;
614607

615608
public:
616-
617609
/**
618610
* Default constructor:
619611
* default minimum group size is 8, default maximum group size is
@@ -695,7 +687,6 @@ class colony : private element_allocator_type
695687
}
696688

697689
private:
698-
699690
inline void blank() noexcept {
700691
// if all pointer types are trivial, we can just nuke it from orbit with memset (NULL is always 0 in C++):
701692
if COLONY_CONSTEXPR( std::is_trivial<group_pointer_type>::value &&
@@ -716,7 +707,6 @@ class colony : private element_allocator_type
716707
}
717708

718709
public:
719-
720710
/**
721711
* Move constructor:
722712
* Move all contents from source colony, does not remove any erased element locations or
@@ -873,7 +863,6 @@ class colony : private element_allocator_type
873863
}
874864

875865
private:
876-
877866
void destroy_all_data() noexcept {
878867
// Amusingly enough, these changes from && to logical & actually do make a significant difference in debug mode
879868
if( ( total_number_of_elements != 0 ) & !( std::is_trivially_destructible<element_type>::value ) ) {
@@ -936,7 +925,6 @@ class colony : private element_allocator_type
936925
}
937926

938927
public:
939-
940928
/**
941929
* Inserts the element supplied to the colony, using the object's copy-constructor. Will
942930
* insert the element into a previously erased element slot if one exists, otherwise will
@@ -1392,7 +1380,6 @@ class colony : private element_allocator_type
13921380
}
13931381

13941382
private:
1395-
13961383
// Internal functions for fill insert:
13971384
void group_create( const skipfield_type number_of_elements ) {
13981385
const group_pointer_type next_group = end_iterator.group_pointer->next_group = COLONY_ALLOCATE(
@@ -1515,7 +1502,6 @@ class colony : private element_allocator_type
15151502
}
15161503

15171504
public:
1518-
15191505
/**
15201506
* Fill insert:
15211507
* Inserts n copies of val into the colony. Will insert the element into a previously erased
@@ -1679,7 +1665,6 @@ class colony : private element_allocator_type
16791665
}
16801666

16811667
private:
1682-
16831668
inline COLONY_FORCE_INLINE void update_subsequent_group_numbers( group_pointer_type current_group )
16841669
noexcept {
16851670
do {
@@ -1729,7 +1714,6 @@ class colony : private element_allocator_type
17291714
}
17301715

17311716
public:
1732-
17331717
/**
17341718
* Removes the element pointed to by the supplied iterator, from the colony. Returns an
17351719
* iterator pointing to the next non-erased element in the colony (or to end() if no more
@@ -3209,7 +3193,6 @@ class colony : private element_allocator_type
32093193
}
32103194

32113195
private:
3212-
32133196
struct less {
32143197
bool operator()( const element_type &a, const element_type &b ) const noexcept {
32153198
return a < b;
@@ -3233,7 +3216,6 @@ class colony : private element_allocator_type
32333216
};
32343217

32353218
public:
3236-
32373219
/**
32383220
* Sort the content of the colony. By default this compares the colony content using a
32393221
* less-than operator, unless the user supplies a comparison function (ie. same conditions
@@ -3485,8 +3467,7 @@ class colony : private element_allocator_type
34853467
source.group_allocator_pair.max_elements_per_group = swap_max_elements_per_group;
34863468
}
34873469
}
3488-
3489-
}; // colony
3470+
}; // colony
34903471

34913472
/**
34923473
* Swaps colony A's contents with that of colony B.

src/game.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,6 @@ class game
904904
// Draws the pixel minimap based on the player's current location
905905
void draw_pixel_minimap( const catacurses::window &w );
906906
private:
907-
908907
// int autosave_timeout(); // If autosave enabled, how long we should wait for user inaction before saving.
909908
void autosave(); // automatic quicksaves - Performs some checks before calling quicksave()
910909
public:
@@ -972,7 +971,6 @@ class game
972971
achievements_tracker &achievements();
973972
memorial_logger &memorial();
974973
public:
975-
976974
spell_events &spell_events_subscriber();
977975

978976
pimpl<Creature_tracker> critter_tracker;

src/string_id.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class string_id
117117

118118
const T &operator*() const {
119119
return obj();
120-
121120
}
122121
const T *operator->() const {
123122
return &obj();

0 commit comments

Comments
 (0)