aboutsummaryrefslogtreecommitdiff
path: root/build2
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-08-23 12:24:23 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-08-23 12:24:23 +0200
commit20f97f06ce54c31e32cf58cfd1b7cae3617c1661 (patch)
tree77c38da3112396d66bebd167434f628e0115c6e6 /build2
parente7cc0a1a047ebe864f17e7d354214458cf87554e (diff)
Get rid of var_extension char array
Diffstat (limited to 'build2')
-rw-r--r--build2/bin/target.cxx60
-rw-r--r--build2/cc/target.cxx8
-rw-r--r--build2/cli/target.cxx4
-rw-r--r--build2/cxx/target.cxx20
4 files changed, 46 insertions, 46 deletions
diff --git a/build2/bin/target.cxx b/build2/bin/target.cxx
index 6ea0988..9074317 100644
--- a/build2/bin/target.cxx
+++ b/build2/bin/target.cxx
@@ -105,8 +105,8 @@ namespace build2
&objx::static_type,
&m_factory<obje, obj>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -118,8 +118,8 @@ namespace build2
&bmix::static_type,
&m_factory<bmie, bmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -131,8 +131,8 @@ namespace build2
&hbmix::static_type,
&m_factory<hbmie, hbmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -144,8 +144,8 @@ namespace build2
&objx::static_type,
&m_factory<obja, obj>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -157,8 +157,8 @@ namespace build2
&bmix::static_type,
&m_factory<bmia, bmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -170,8 +170,8 @@ namespace build2
&hbmix::static_type,
&m_factory<hbmia, hbmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -183,8 +183,8 @@ namespace build2
&objx::static_type,
&m_factory<objs, obj>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -196,8 +196,8 @@ namespace build2
&bmix::static_type,
&m_factory<bmis, bmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -209,8 +209,8 @@ namespace build2
&hbmix::static_type,
&m_factory<hbmis, hbmi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -222,8 +222,8 @@ namespace build2
&libux::static_type,
&target_factory<libue>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -235,8 +235,8 @@ namespace build2
&libux::static_type,
&m_factory<libua, libul>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -248,8 +248,8 @@ namespace build2
&libux::static_type,
&m_factory<libus, libul>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&target_search, // Note: not _file(); don't look for an existing file.
false
@@ -372,8 +372,8 @@ namespace build2
&file::static_type,
&m_factory<liba, lib>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&file_search,
false
@@ -385,8 +385,8 @@ namespace build2
&file::static_type,
&m_factory<libs, lib>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&file_search,
false
@@ -447,8 +447,8 @@ namespace build2
&file::static_type,
&target_factory<libi>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, nullptr>,
- &target_pattern_var<var_extension, nullptr>,
+ &target_extension_var<nullptr>,
+ &target_pattern_var<nullptr>,
nullptr,
&file_search,
false
diff --git a/build2/cc/target.cxx b/build2/cc/target.cxx
index c637e60..89b9391 100644
--- a/build2/cc/target.cxx
+++ b/build2/cc/target.cxx
@@ -33,8 +33,8 @@ namespace build2
&cc::static_type,
&target_factory<h>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, h_ext_def>,
- &target_pattern_var<var_extension, h_ext_def>,
+ &target_extension_var<h_ext_def>,
+ &target_pattern_var<h_ext_def>,
nullptr,
&file_search,
false
@@ -48,8 +48,8 @@ namespace build2
&cc::static_type,
&target_factory<c>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, c_ext_def>,
- &target_pattern_var<var_extension, c_ext_def>,
+ &target_extension_var<c_ext_def>,
+ &target_pattern_var<c_ext_def>,
nullptr,
&file_search,
false
diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx
index caa12b0..2fd70f7 100644
--- a/build2/cli/target.cxx
+++ b/build2/cli/target.cxx
@@ -23,8 +23,8 @@ namespace build2
&file::static_type,
&target_factory<cli>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, cli_ext_def>,
- &target_pattern_var<var_extension, cli_ext_def>,
+ &target_extension_var<cli_ext_def>,
+ &target_pattern_var<cli_ext_def>,
nullptr,
&file_search,
false
diff --git a/build2/cxx/target.cxx b/build2/cxx/target.cxx
index 025bf9d..45463f3 100644
--- a/build2/cxx/target.cxx
+++ b/build2/cxx/target.cxx
@@ -19,8 +19,8 @@ namespace build2
&cc::static_type,
&target_factory<hxx>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, hxx_ext_def>,
- &target_pattern_var<var_extension, hxx_ext_def>,
+ &target_extension_var<hxx_ext_def>,
+ &target_pattern_var<hxx_ext_def>,
nullptr,
&file_search,
false
@@ -33,8 +33,8 @@ namespace build2
&cc::static_type,
&target_factory<ixx>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, ixx_ext_def>,
- &target_pattern_var<var_extension, ixx_ext_def>,
+ &target_extension_var<ixx_ext_def>,
+ &target_pattern_var<ixx_ext_def>,
nullptr,
&file_search,
false
@@ -47,8 +47,8 @@ namespace build2
&cc::static_type,
&target_factory<txx>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, txx_ext_def>,
- &target_pattern_var<var_extension, txx_ext_def>,
+ &target_extension_var<txx_ext_def>,
+ &target_pattern_var<txx_ext_def>,
nullptr,
&file_search,
false
@@ -61,8 +61,8 @@ namespace build2
&cc::static_type,
&target_factory<cxx>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, cxx_ext_def>,
- &target_pattern_var<var_extension, cxx_ext_def>,
+ &target_extension_var<cxx_ext_def>,
+ &target_pattern_var<cxx_ext_def>,
nullptr,
&file_search,
false
@@ -75,8 +75,8 @@ namespace build2
&cc::static_type,
&target_factory<mxx>,
nullptr, /* fixed_extension */
- &target_extension_var<var_extension, mxx_ext_def>,
- &target_pattern_var<var_extension, mxx_ext_def>,
+ &target_extension_var<mxx_ext_def>,
+ &target_pattern_var<mxx_ext_def>,
nullptr,
&file_search,
false