Changes to build with GCC 3.1

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3064 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-07-24 22:08:36 +00:00
parent 24e9872732
commit 7f4dd472e3
4 changed files with 32 additions and 28 deletions

View File

@ -403,8 +403,8 @@ public:
// Default implementation, requires user to populate it with values somehow.
template<class Opt> // parse - Return true on error.
bool parse(Opt &O, const char *ArgName, const string &Arg) {
string ArgVal;
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
std::string ArgVal;
if (hasArgStr)
ArgVal = Arg;
else
@ -441,11 +441,11 @@ public:
//
template<>
class parser<bool> {
static bool parseImpl(Option &O, const string &Arg, bool &Val);
static bool parseImpl(Option &O, const std::string &Arg, bool &Val);
public:
template<class Opt> // parse - Return true on error.
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
bool Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -473,12 +473,12 @@ public:
//
template<>
class parser<int> {
static bool parseImpl(Option &O, const string &Arg, int &Val);
static bool parseImpl(Option &O, const std::string &Arg, int &Val);
public:
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
int Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -506,12 +506,12 @@ public:
//
template<>
class parser<double> {
static bool parseImpl(Option &O, const string &Arg, double &Val);
static bool parseImpl(Option &O, const std::string &Arg, double &Val);
public:
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
double Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -539,13 +539,13 @@ template<> struct parser<float> : public parser<double> {};
//--------------------------------------------------
// parser<string>
// parser<std::string>
//
template<>
struct parser<string> {
struct parser<std::string> {
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
O.addValue(Arg);
return false;
}

View File

@ -9,14 +9,16 @@
#define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
#include "Support/GraphTraits.h"
#include <iterator>
#include <Support/iterator>
#include <stack>
#include <set>
// Generic Depth First Iterator
template<class GraphT, class GT = GraphTraits<GraphT> >
class df_iterator : public std::forward_iterator<typename GT::NodeType,
ptrdiff_t> {
class df_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t> {
typedef forward_iterator<typename GT::NodeType, ptrdiff_t> super;
typedef typename super::pointer pointer;
typedef typename GT::NodeType NodeType;
typedef typename GT::ChildIteratorType ChildItTy;

View File

@ -9,14 +9,16 @@
#define LLVM_SUPPORT_DEPTH_FIRST_ITERATOR_H
#include "Support/GraphTraits.h"
#include <iterator>
#include <Support/iterator>
#include <stack>
#include <set>
// Generic Depth First Iterator
template<class GraphT, class GT = GraphTraits<GraphT> >
class df_iterator : public std::forward_iterator<typename GT::NodeType,
ptrdiff_t> {
class df_iterator : public forward_iterator<typename GT::NodeType, ptrdiff_t> {
typedef forward_iterator<typename GT::NodeType, ptrdiff_t> super;
typedef typename super::pointer pointer;
typedef typename GT::NodeType NodeType;
typedef typename GT::ChildIteratorType ChildItTy;

View File

@ -403,8 +403,8 @@ public:
// Default implementation, requires user to populate it with values somehow.
template<class Opt> // parse - Return true on error.
bool parse(Opt &O, const char *ArgName, const string &Arg) {
string ArgVal;
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
std::string ArgVal;
if (hasArgStr)
ArgVal = Arg;
else
@ -441,11 +441,11 @@ public:
//
template<>
class parser<bool> {
static bool parseImpl(Option &O, const string &Arg, bool &Val);
static bool parseImpl(Option &O, const std::string &Arg, bool &Val);
public:
template<class Opt> // parse - Return true on error.
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
bool Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -473,12 +473,12 @@ public:
//
template<>
class parser<int> {
static bool parseImpl(Option &O, const string &Arg, int &Val);
static bool parseImpl(Option &O, const std::string &Arg, int &Val);
public:
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
int Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -506,12 +506,12 @@ public:
//
template<>
class parser<double> {
static bool parseImpl(Option &O, const string &Arg, double &Val);
static bool parseImpl(Option &O, const std::string &Arg, double &Val);
public:
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
double Val;
bool Error = parseImpl(O, Arg, Val);
if (!Error) O.addValue(Val);
@ -539,13 +539,13 @@ template<> struct parser<float> : public parser<double> {};
//--------------------------------------------------
// parser<string>
// parser<std::string>
//
template<>
struct parser<string> {
struct parser<std::string> {
// parse - Return true on error.
template<class Opt>
bool parse(Opt &O, const char *ArgName, const string &Arg) {
bool parse(Opt &O, const char *ArgName, const std::string &Arg) {
O.addValue(Arg);
return false;
}