From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 10 Jun 2008 13:17:22 +0000 (+0000)
Subject: Add missing includes
X-Git-Tag: 0.9~8
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=bdc8b6638b486aa668b4a9c6c5cce5f6b5f18222;p=builder.git

Add missing includes
Fix style warnings from gcc 4.3
Disable -Wconversion since it causes too much trouble with gcc 4.3
---

diff --git a/source/builder.cpp b/source/builder.cpp
index d3aabf9..e4f7e58 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -780,7 +780,7 @@ int Builder::do_clean()
 	for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
 	{
 		Action *action=new Unlink(*this, **i);
-		while(action->check()<0);
+		while(action->check()<0) ;
 		delete action;
 	}
 
diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 4a10872..5164ab0 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include "buildinfo.h"
 
 using namespace Msp;
diff --git a/source/config.cpp b/source/config.cpp
index 753a4ef..4cc9149 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstdlib>
 #include <msp/core/except.h>
 #include <msp/io/except.h>
 #include <msp/io/file.h>
@@ -150,7 +151,7 @@ void Config::finish()
 				}
 				else
 				{
-					for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end);
+					for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end) ;
 					var=opt.value.substr(dollar+1, end-dollar-1);
 				}
 
diff --git a/source/externalaction.cpp b/source/externalaction.cpp
index 54c9acc..14657a0 100644
--- a/source/externalaction.cpp
+++ b/source/externalaction.cpp
@@ -7,6 +7,8 @@ Distributed under the LGPL
 
 #include <sys/wait.h>
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "externalaction.h"
diff --git a/source/misc.cpp b/source/misc.cpp
index 30239a4..a299f0e 100644
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -7,6 +7,8 @@ Distributed under the LGPL
 
 #include <iostream>
 #include <sys/wait.h>
+#include <cstdlib>
+#include <cstring>
 #include "misc.h"
 
 using namespace std;
diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 6790082..c5a87fd 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ef0e60c..8cff0df 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -176,7 +176,7 @@ void SourcePackage::create_build_info()
 	build_info.cflags.push_back("-Wshadow");
 	build_info.cflags.push_back("-Wextra");
 	build_info.cflags.push_back("-Wpointer-arith");
-	build_info.cflags.push_back("-Wconversion");
+	//build_info.cflags.push_back("-Wconversion");
 	build_info.cflags.push_back("-Werror");
 
 	unsigned flags=get_install_flags();
diff --git a/source/tar.cpp b/source/tar.cpp
index 0b61b39..d43a5b0 100644
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <iostream>
+#include <cstring>
 #include <msp/io/file.h>
 #include <msp/path/utils.h>
 #include "builder.h"