aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build2/c/init.cxx4
-rw-r--r--build2/config/operation4
-rw-r--r--build2/config/operation.cxx4
-rw-r--r--build2/cxx/init.cxx4
-rw-r--r--build2/dist/operation2
-rw-r--r--build2/dist/operation.cxx2
-rw-r--r--build2/install/operation4
-rw-r--r--build2/install/operation.cxx4
-rw-r--r--build2/operation10
-rw-r--r--build2/operation.cxx10
-rw-r--r--build2/target.cxx2
-rw-r--r--build2/test/operation2
-rw-r--r--build2/test/operation.cxx2
13 files changed, 27 insertions, 27 deletions
diff --git a/build2/c/init.cxx b/build2/c/init.cxx
index 95bfd7c..f33ba9e 100644
--- a/build2/c/init.cxx
+++ b/build2/c/init.cxx
@@ -191,13 +191,13 @@ namespace build2
return true;
}
- static const target_type* hdr[] =
+ static const target_type* const hdr[] =
{
&h::static_type,
nullptr
};
- static const target_type* inc[] =
+ static const target_type* const inc[] =
{
&h::static_type,
&c::static_type,
diff --git a/build2/config/operation b/build2/config/operation
index b55412a..f2f0538 100644
--- a/build2/config/operation
+++ b/build2/config/operation
@@ -14,8 +14,8 @@ namespace build2
{
namespace config
{
- extern meta_operation_info configure;
- extern meta_operation_info disfigure;
+ extern const meta_operation_info configure;
+ extern const meta_operation_info disfigure;
}
}
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index e8ba1c2..f74136c 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -386,7 +386,7 @@ namespace build2
}
}
- meta_operation_info configure {
+ const meta_operation_info configure {
configure_id,
"configure",
"configure",
@@ -580,7 +580,7 @@ namespace build2
}
}
- meta_operation_info disfigure {
+ const meta_operation_info disfigure {
disfigure_id,
"disfigure",
"disfigure",
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index 867deba..477056c 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -254,7 +254,7 @@ namespace build2
return true;
}
- static const target_type* hdr[] =
+ static const target_type* const hdr[] =
{
&hxx::static_type,
&ixx::static_type,
@@ -263,7 +263,7 @@ namespace build2
nullptr
};
- static const target_type* inc[] =
+ static const target_type* const inc[] =
{
&hxx::static_type,
&ixx::static_type,
diff --git a/build2/dist/operation b/build2/dist/operation
index 8a0fb73..845130f 100644
--- a/build2/dist/operation
+++ b/build2/dist/operation
@@ -14,7 +14,7 @@ namespace build2
{
namespace dist
{
- extern meta_operation_info dist;
+ extern const meta_operation_info dist;
}
}
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index 9535566..1b96282 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -453,7 +453,7 @@ namespace build2
}
}
- meta_operation_info dist {
+ const meta_operation_info dist {
dist_id,
"dist",
"distribute",
diff --git a/build2/install/operation b/build2/install/operation
index a21d399..02d406e 100644
--- a/build2/install/operation
+++ b/build2/install/operation
@@ -14,8 +14,8 @@ namespace build2
{
namespace install
{
- extern operation_info install;
- extern operation_info uninstall;
+ extern const operation_info install;
+ extern const operation_info uninstall;
}
}
diff --git a/build2/install/operation.cxx b/build2/install/operation.cxx
index c35f022..56f65e1 100644
--- a/build2/install/operation.cxx
+++ b/build2/install/operation.cxx
@@ -19,7 +19,7 @@ namespace build2
return mo != disfigure_id ? update_id : 0;
}
- operation_info install {
+ const operation_info install {
install_id,
"install",
"install",
@@ -39,7 +39,7 @@ namespace build2
// link.exe only creates a DLL's import library if there are any exported
// symbols).
//
- operation_info uninstall {
+ const operation_info uninstall {
uninstall_id,
"uninstall",
"uninstall",
diff --git a/build2/operation b/build2/operation
index bddc197..0daf413 100644
--- a/build2/operation
+++ b/build2/operation
@@ -251,8 +251,8 @@ namespace build2
void
execute (action, const action_targets&, bool quiet);
- extern meta_operation_info noop;
- extern meta_operation_info perform;
+ extern const meta_operation_info noop;
+ extern const meta_operation_info perform;
// Operation info.
//
@@ -283,9 +283,9 @@ namespace build2
// Built-in operations.
//
- extern operation_info default_;
- extern operation_info update;
- extern operation_info clean;
+ extern const operation_info default_;
+ extern const operation_info update;
+ extern const operation_info clean;
// Global meta/operation tables. Each registered meta/operation
// is assigned an id which is used as an index in the per-project
diff --git a/build2/operation.cxx b/build2/operation.cxx
index f2e3a29..545bc9e 100644
--- a/build2/operation.cxx
+++ b/build2/operation.cxx
@@ -169,7 +169,7 @@ namespace build2
}
}
- meta_operation_info noop {
+ const meta_operation_info noop {
noop_id,
"noop",
"", // Presumably we will never need these since we are not going
@@ -185,7 +185,7 @@ namespace build2
nullptr // meta-operation post
};
- meta_operation_info perform {
+ const meta_operation_info perform {
perform_id,
"perform",
"",
@@ -203,7 +203,7 @@ namespace build2
// operations
//
- operation_info default_ {
+ const operation_info default_ {
default_id,
"<default>",
"",
@@ -214,7 +214,7 @@ namespace build2
nullptr
};
- operation_info update {
+ const operation_info update {
update_id,
"update",
"update",
@@ -225,7 +225,7 @@ namespace build2
nullptr
};
- operation_info clean {
+ const operation_info clean {
clean_id,
"clean",
"clean",
diff --git a/build2/target.cxx b/build2/target.cxx
index 0a97566..64b376c 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -35,7 +35,7 @@ namespace build2
// target_state
//
- static const char* target_state_[] = {
+ static const char* const target_state_[] = {
"unknown", "unchanged", "postponed", "changed", "failed", "group"};
ostream&
diff --git a/build2/test/operation b/build2/test/operation
index 10af2b2..5d2a229 100644
--- a/build2/test/operation
+++ b/build2/test/operation
@@ -14,7 +14,7 @@ namespace build2
{
namespace test
{
- extern operation_info test;
+ extern const operation_info test;
}
}
diff --git a/build2/test/operation.cxx b/build2/test/operation.cxx
index c014d5a..7f74323 100644
--- a/build2/test/operation.cxx
+++ b/build2/test/operation.cxx
@@ -19,7 +19,7 @@ namespace build2
return mo != disfigure_id ? update_id : 0;
}
- operation_info test {
+ const operation_info test {
test_id,
"test",
"test",