aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-06-29 16:38:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-06-29 16:38:24 +0200
commit30af663dfc7f152e208962fc033d46bd4c7b7cb2 (patch)
tree6768d8e3344ec6caa146748a8cc3b34e20bda304
parenta8777a4aa67b1cf60d7053635d1a3edadca5779e (diff)
Work around MSVC 14.3 issues
-rw-r--r--libbuild2/cc/link-rule.cxx4
-rw-r--r--libbuild2/dyndep.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index da9cca4..c4938c9 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -1614,7 +1614,7 @@ namespace build2
// Note also that the order in which we are adding these members
// is important (see add_addhoc_member() for details).
//
- if (t.group->decl >= target_decl::implied
+ if (operator>= (t.group->decl, target_decl::implied) // @@ VC14
? (ot == otype::a || !link_members (rs).a)
: search_existing (ctx,
ot == otype::a
@@ -2799,7 +2799,7 @@ namespace build2
if (!m->is_a (la ? pca::static_type : pcs::static_type))
{
- if (t.group->decl >= target_decl::implied
+ if (operator>= (t.group->decl, target_decl::implied) // @@ VC14
? t.group->matched (a)
: true)
{
diff --git a/libbuild2/dyndep.cxx b/libbuild2/dyndep.cxx
index bbbf807..76eac9c 100644
--- a/libbuild2/dyndep.cxx
+++ b/libbuild2/dyndep.cxx
@@ -542,7 +542,7 @@ namespace build2
// implied ones because pre-entered members of a target group
// (e.g., cli.cxx) are implied.
//
- if (x->decl >= target_decl::implied)
+ if (operator>= (x->decl, target_decl::implied)) // @@ VC14
{
r = x;
break;