Change Tool's protected constructor to take a pointer to Architecture

diff --git a/source/androidcompiler.cpp b/source/androidcompiler.cpp
index 9ae31ac1b0d6d7fd732b188f65a4625c491ab36f..63fd5273a05ec96925d07530853dabbedd359209 100644 (file)
--- a/source/androidcompiler.cpp
+++ b/source/androidcompiler.cpp
@@ -13,7 +13,7 @@ using namespace std;
 using namespace Msp;
 
 AndroidCompiler::AndroidCompiler(Builder &b, const Architecture &a, const string &t, const AndroidNdk &n):
-       GnuCompiler(b, a, t),
+       GnuCompiler(b, &a, t),
        ndk(n)
 {
        if(ndk.get_root_dir().empty())

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 2f5ba24d6068d7c3f9c5d695b502a87d955f3d5c..629cb708637c6c090d55b92a74b3df649e8280a3 100644 (file)
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -14,7 +14,7 @@ using namespace std;
 using namespace Msp;
 
 GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
-       Tool(b, a, "AR")
+       Tool(b, &a, "AR")
 {
        set_command("ar", true);
        input_suffixes.push_back(".o");

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 086a1ed4a684984a06f2e8f3af4e761ea552619b..91d5a17ca62374e46e4ee2316be51f38baeec61e 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -28,7 +28,7 @@ const char *cpus[] =
 }
 
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
-       Tool(b, a, t),
+       Tool(b, &a, t),
        version(0)
 {
        if(tag=="CC")

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 619c9e784b3a00ec5bd22e2e537afb90da9e85d9..2416449d63c5654a6f6dce62d6a620a6af1420c7 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -22,7 +22,7 @@ using namespace std;
 using namespace Msp;
 
 GnuLinker::GnuLinker(Builder &b, const Architecture &a):
-       Tool(b, a, "LINK")
+       Tool(b, &a, "LINK")
 {
        input_suffixes.push_back(".o");
        input_suffixes.push_back(".a");

diff --git a/source/mingwdlltool.cpp b/source/mingwdlltool.cpp
index 62ef7059a885d7a78d2dd216b2d2612c3eeabd42..c6eddc0e763fa149fd8f7fd78152075254326c86 100644 (file)
--- a/source/mingwdlltool.cpp
+++ b/source/mingwdlltool.cpp
@@ -16,7 +16,7 @@ using namespace std;
 using namespace Msp;
 
 MingwDllTool::MingwDllTool(Builder &b, const Architecture &a):
-       Tool(b, a, "DLL")
+       Tool(b, &a, "DLL")
 {
        set_command("dlltool", true);
        set_run(_run);

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index 2d5d84260358734f4c8bac93d19cb8c594066796..26fbc1d980a81888b45062ddf11ecc164040d9d4 100644 (file)
--- a/source/msvcarchiver.cpp
+++ b/source/msvcarchiver.cpp
@@ -11,7 +11,7 @@ using namespace std;
 using namespace Msp;
 
 MsvcArchiver::MsvcArchiver(Builder &b, const Architecture &a, const MicrosoftTools &m):
-       Tool(b, a, "AR"),
+       Tool(b, &a, "AR"),
        ms_tools(m)
 {
        input_suffixes.push_back(".o");

diff --git a/source/msvccompiler.cpp b/source/msvccompiler.cpp
index 099c1230b7e5e18518c429dd7bc3f865180ea9c8..c3361ee61b7993a4dad465c81487e5020037e1b3 100644 (file)
--- a/source/msvccompiler.cpp
+++ b/source/msvccompiler.cpp
@@ -16,7 +16,7 @@ using namespace std;
 using namespace Msp;
 
 MsvcCompiler::MsvcCompiler(Builder &b, const Architecture &a, const string &t, const MicrosoftTools &m):
-       Tool(b, a, t),
+       Tool(b, &a, t),
        ms_tools(m)
 {
        if(tag=="CC")

diff --git a/source/msvclinker.cpp b/source/msvclinker.cpp
index 62e9d2af0a8def642427bbcdbe43f1299652b08b..f802ef63e454d714cc4a90fe4341997ab87b1726 100644 (file)
--- a/source/msvclinker.cpp
+++ b/source/msvclinker.cpp
@@ -17,7 +17,7 @@ using namespace std;
 using namespace Msp;
 
 MsvcLinker::MsvcLinker(Builder &b, const Architecture &a, const MicrosoftTools &m):
-       Tool(b, a, "LINK"),
+       Tool(b, &a, "LINK"),
        ms_tools(m)
 {
        input_suffixes.push_back(".o");

diff --git a/source/tool.h b/source/tool.h
index ca19c6f17b522cda1565371c60cbc0e97304f3df..5ea63356a4028b0d6afac2dfe0b6be02fce1c65c 100644 (file)
--- a/source/tool.h
+++ b/source/tool.h
@@ -46,8 +46,6 @@ protected:
        std::vector<std::string> problems;
 
        Tool(Builder &b, const std::string &t): Tool(b, 0, t) { }
-       Tool(Builder &b, const Architecture &a, const std::string &t): Tool(b, &a, t) { }
-private:
        Tool(Builder &b, const Architecture *a, const std::string &t): builder(b), architecture(a), tag(t) { }
 public:
        virtual ~Tool() { }