From add9d36d54f02265c62026d107dd119c9310b724 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Sun, 19 Jun 2016 14:10:31 -0700
Subject: 3063

---
 tangle/001trace.cc  | 4 ++--
 tangle/003tangle.cc | 6 +++---
 tangle/boot.cc      | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'tangle')

diff --git a/tangle/001trace.cc b/tangle/001trace.cc
index 67dceba2..5d9e3d8a 100644
--- a/tangle/001trace.cc
+++ b/tangle/001trace.cc
@@ -133,8 +133,8 @@ vector<string> split(string s, string delim) {
   vector<string> result;
   string::size_type begin=0, end=s.find(delim);
   while (true) {
-    if (end == NOT_FOUND) {
-      result.push_back(string(s, begin, NOT_FOUND));
+    if (end == string::npos) {
+      result.push_back(string(s, begin, string::npos));
       break;
     }
     result.push_back(string(s, begin, end-begin));
diff --git a/tangle/003tangle.cc b/tangle/003tangle.cc
index b536f242..086cca23 100644
--- a/tangle/003tangle.cc
+++ b/tangle/003tangle.cc
@@ -373,14 +373,14 @@ Line expected_not_in_trace(const Line& line) {
 
 list<Line>::iterator find_substr(list<Line>& in, const string& pat) {
   for (list<Line>::iterator p = in.begin(); p != in.end(); ++p)
-    if (p->contents.find(pat) != NOT_FOUND)
+    if (p->contents.find(pat) != string::npos)
       return p;
   return in.end();
 }
 
 list<Line>::iterator find_substr(list<Line>& in, list<Line>::iterator p, const string& pat) {
   for (; p != in.end(); ++p)
-    if (p->contents.find(pat) != NOT_FOUND)
+    if (p->contents.find(pat) != string::npos)
       return p;
   return in.end();
 }
@@ -400,7 +400,7 @@ string escape(string s) {
 }
 
 string replace_all(string s, const string& a, const string& b) {
-  for (size_t pos = s.find(a); pos != NOT_FOUND; pos = s.find(a, pos+b.size()))
+  for (size_t pos = s.find(a); pos != string::npos; pos = s.find(a, pos+b.size()))
     s = s.replace(pos, a.size(), b);
   return s;
 }
diff --git a/tangle/boot.cc b/tangle/boot.cc
index 2b24f6d7..4ae68c89 100644
--- a/tangle/boot.cc
+++ b/tangle/boot.cc
@@ -11,7 +11,6 @@ using std::pair;
 
 #include<string>
 using std::string;
-const size_t NOT_FOUND = string::npos;
 
 #include<iostream>
 using std::istream;
-- 
cgit 1.4.1-2-gfad0