summaryrefslogtreecommitdiff
path: root/src/utils/cpp/TARGETS
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@gmail.com>2023-04-15 16:28:33 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-04-26 18:29:44 +0200
commitd762bfa1953933dfac0a29a74523c25719396b8c (patch)
tree1002b0aecc1af698f0349a4efb4bfc169886c60a /src/utils/cpp/TARGETS
parent03e1019aca5d08e53bfeb455071d91561fc33039 (diff)
downloadjustbuild-d762bfa1953933dfac0a29a74523c25719396b8c.tar.gz
imports: Switch to Microsoft GSL implementation
... with two minor code base changes compared to previous use of gsl-lite: - dag.hpp: ActionNode::Ptr and ArtifactNode::Ptr are not wrapped in gsl::not_null<> anymore, due to lack of support for wrapping std::unique_ptr<>. More specifically, the move constructor is missing, rendering it impossible to use std::vector<>::emplace_back(). - utils/cpp/gsl.hpp: New header file added to implement the macros ExpectsAudit() and EnsureAudit(), asserts running only in debug builds, which were available in gsl-lite but are missing in MS GSL.
Diffstat (limited to 'src/utils/cpp/TARGETS')
-rw-r--r--src/utils/cpp/TARGETS17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/utils/cpp/TARGETS b/src/utils/cpp/TARGETS
index 42d8ae9e..fffb2e7b 100644
--- a/src/utils/cpp/TARGETS
+++ b/src/utils/cpp/TARGETS
@@ -2,21 +2,21 @@
{ "type": ["@", "rules", "CC", "library"]
, "name": ["hash_combine"]
, "hdrs": ["hash_combine.hpp"]
- , "deps": [["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": [["@", "gsl", "", "gsl"]]
, "stage": ["src", "utils", "cpp"]
}
, "type_safe_arithmetic":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["type_safe_arithmetic"]
, "hdrs": ["type_safe_arithmetic.hpp"]
- , "deps": [["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": [["@", "gsl", "", "gsl"]]
, "stage": ["src", "utils", "cpp"]
}
, "json":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["json"]
, "hdrs": ["json.hpp"]
- , "deps": [["@", "json", "", "json"], ["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": ["gsl", ["@", "json", "", "json"], ["@", "gsl", "", "gsl"]]
, "stage": ["src", "utils", "cpp"]
}
, "concepts":
@@ -54,7 +54,7 @@
, "name": ["tmp_dir"]
, "hdrs": ["tmp_dir.hpp"]
, "srcs": ["tmp_dir.cpp"]
- , "deps": [["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": [["@", "gsl", "", "gsl"]]
, "stage": ["src", "utils", "cpp"]
, "private-deps": [["src/buildtool/file_system", "file_system_manager"]]
}
@@ -63,11 +63,18 @@
, "name": ["file_locking"]
, "hdrs": ["file_locking.hpp"]
, "srcs": ["file_locking.cpp"]
- , "deps": [["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": [["@", "gsl", "", "gsl"]]
, "stage": ["src", "utils", "cpp"]
, "private-deps":
[ ["src/buildtool/file_system", "file_system_manager"]
, ["src/utils/cpp", "path"]
]
}
+, "gsl":
+ { "type": ["@", "rules", "CC", "library"]
+ , "name": ["gsl"]
+ , "hdrs": ["gsl.hpp"]
+ , "deps": [["@", "gsl", "", "gsl"]]
+ , "stage": ["src", "utils", "cpp"]
+ }
}