projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.127' into main
[feisty_meow.git]
/
nucleus
/
tools
/
clam_tools
/
value_tagger.cpp
diff --git
a/nucleus/tools/clam_tools/value_tagger.cpp
b/nucleus/tools/clam_tools/value_tagger.cpp
index 80debd79ffe5cc3f1d2527bc775f8fd267824558..9fb6c780b7d0c42e55d97e7daed1e260e563e248 100644
(file)
--- a/
nucleus/tools/clam_tools/value_tagger.cpp
+++ b/
nucleus/tools/clam_tools/value_tagger.cpp
@@
-24,7
+24,6
@@
* Please send any updates to: fred@gruntose.com *
\*****************************************************************************/
* Please send any updates to: fred@gruntose.com *
\*****************************************************************************/
-#include <algorithms/shell_sort.h>
#include <application/application_shell.h>
#include <application/command_line.h>
#include <application/hoople_main.h>
#include <application/application_shell.h>
#include <application/command_line.h>
#include <application/hoople_main.h>
@@
-46,6
+45,8
@@
#include <textual/parser_bits.h>
#include <sys/stat.h>
#include <textual/parser_bits.h>
#include <sys/stat.h>
+
+#include "../../library/algorithms/sorts.h"
#ifdef __WIN32__
#include <io.h>
#endif
#ifdef __WIN32__
#include <io.h>
#endif
@@
-100,7
+101,7
@@
class search_record
{
public:
search_record(const astring &search = astring::empty_string(),
{
public:
search_record(const astring &search = astring::empty_string(),
- bool is_link = false, search_record *link = N
IL
)
+ bool is_link = false, search_record *link = N
ULL_POINTER
)
: _search(search), _no_modify(false), _is_link(is_link), _our_link(link),
_current_value(0), _value_increment(1) {}
: _search(search), _no_modify(false), _is_link(is_link), _our_link(link),
_current_value(0), _value_increment(1) {}
@@
-215,7
+216,7
@@
private:
value_tagger::value_tagger()
: application_shell(),
value_tagger::value_tagger()
: application_shell(),
- _ini(N
IL
),
+ _ini(N
ULL_POINTER
),
_dirs_seen(10)
{
}
_dirs_seen(10)
{
}
@@
-411,7
+412,7
@@
variables before running a build.\r\n";
{
// check for whether this section is linked to another or not.
astring linked = _ini->load(curr_name, "link", "");
{
// check for whether this section is linked to another or not.
astring linked = _ini->load(curr_name, "link", "");
- search_record *our_link_found = N
IL
;
+ search_record *our_link_found = N
ULL_POINTER
;
if (linked.t()) {
// we found that this should be linked to another item.
our_link_found = _search_list.find(linked);
if (linked.t()) {
// we found that this should be linked to another item.
our_link_found = _search_list.find(linked);