Changeset 1311:b810a07248a0 in lemon-0.x

Timestamp:

04/06/05 19:19:54 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1750

Message:

Removing sticky using namespace std.
Making up the using of namespaces.

Location:

src/lemon

Files:

• bits/alteration_notifier.h (modified) (1 diff)
• graph_reader.h (modified) (10 diffs)
• graph_writer.h (modified) (2 diffs)

src/lemon/bits/alteration_notifier.h

@@ -25 +25 @@
 ///\brief Observer registry for graph alteration observers.
 
-using namespace std;
-
 namespace lemon {
 

src/lemon/graph_reader.h

@@ -83 +83 @@
       char c;
       value.clear();
-      is >> ws;
+      is >> std::ws;
       if (!is.get(c) || c != '\"') 
         throw DataFormatError("Quoted string format error");
@@ -358 +358 @@
 
     std::string readNodeSet(int& line_num, 
-                            auto_ptr<InverterBase<Node> > & nodeInverter) {
+                            std::auto_ptr<InverterBase<Node> >& nodeInverter) {
       std::vector<ReaderBase<Node>* > index;
       {
@@ -380 +380 @@
       }
 
-      nodeInverter = auto_ptr<InverterBase<Node> >(index[0]->getInverter());
+      nodeInverter = 
+        std::auto_ptr<InverterBase<Node> >(index[0]->getInverter());
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {
@@ -394 +395 @@
 
     std::string readEdgeSet(int& line_num, 
-                            auto_ptr<InverterBase<Edge> > & edgeInverter, 
-                            auto_ptr<InverterBase<Node> > & nodeInverter) {
+                            std::auto_ptr<InverterBase<Edge> >& edgeInverter, 
+                            std::auto_ptr<InverterBase<Node> >& nodeInverter) {
       std::vector<ReaderBase<Edge>*> index;
       {
@@ -417 +418 @@
       }
 
-      edgeInverter = auto_ptr<InverterBase<Edge> >(index[0]->getInverter());
+      edgeInverter = 
+        std::auto_ptr<InverterBase<Edge> >(index[0]->getInverter());
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {   
@@ -433 +435 @@
 
     std::string readNodes(int& line_num, 
-                          auto_ptr<InverterBase<Node> >& nodeInverter) {
+                          std::auto_ptr<InverterBase<Node> >& nodeInverter) {
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {
@@ -448 +450 @@
 
     std::string readEdges(int& line_num, 
-                          auto_ptr<InverterBase<Edge> >& edgeInverter) {
+                          std::auto_ptr<InverterBase<Edge> >& edgeInverter) {
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {
@@ -466 +468 @@
       while (++line_num, getline(is, line)) {   
         int vi = line.find_first_not_of(" \t");
-        if (vi != (int)string::npos && line[vi] != '#') {
+        if (vi != (int)std::string::npos && line[vi] != '#') {
           return line.substr(vi);
         }
@@ -508 +510 @@
         typename Inverse::iterator it = inverse.find(value);
         if (it == inverse.end()) {
-          inverse.insert(make_pair(value, item));
+          inverse.insert(std::make_pair(value, item));
         } else {
           throw DataFormatError("Multiple ID occurence");
@@ -546 +548 @@
         typename Inverse::iterator it = inverse.find(value);
         if (it == inverse.end()) {
-          inverse.insert(make_pair(value, item));
+          inverse.insert(std::make_pair(value, item));
         } else {
           throw DataFormatError("Multiple ID occurence error");

src/lemon/graph_writer.h

@@ -83 +83 @@
       os << "\"";
       if (escaped) {
-        ostringstream ls;
+        std::ostringstream ls;
         for (int i = 0; i < (int)value.size(); ++i) {
           writeEscape(ls, value[i]);
@@ -133 +133 @@
       default:
         if (c < 0x20) {
-          os << '\\' << oct << (int)c;
+          os << '\\' << std::oct << (int)c;
         } else {
           os << c;