Use std namespace.

I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.

I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.

I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.

1 files changed, 11 insertions, 11 deletions

diff --git a/crawl-ref/source/unicode.h b/crawl-ref/source/unicode.h
index 9cddcd1f41..c056c88a16 100644
--- a/crawl-ref/source/unicode.h
+++ b/crawl-ref/source/unicode.h
@@ -11,28 +11,28 @@ int wctoutf8(char *d, ucs_t s);
 int utf8towc(ucs_t *d, const char *s);
 #ifdef TARGET_OS_WINDOWS
 typedef wchar_t utf16_t;
-std::wstring utf8_to_16(const char *s);
-std::string utf16_to_8(const wchar_t *s);
+wstring utf8_to_16(const char *s);
+string utf16_to_8(const wchar_t *s);
 
-static inline std::wstring utf8_to_16(const std::string &s)
+static inline wstring utf8_to_16(const string &s)
 {
     return utf8_to_16(s.c_str());
 }
-static inline std::string utf16_to_8(const std::wstring &s)
+static inline string utf16_to_8(const wstring &s)
 {
     return utf16_to_8(s.c_str());
 }
 #else
 typedef uint16_t utf16_t;
 #endif
-std::string utf8_to_mb(const char *s);
-std::string mb_to_utf8(const char *s);
+string utf8_to_mb(const char *s);
+string mb_to_utf8(const char *s);
 
-static inline std::string utf8_to_mb(const std::string &s)
+static inline string utf8_to_mb(const string &s)
 {
     return utf8_to_mb(s.c_str());
 }
-static inline std::string mb_to_utf8(const std::string &s)
+static inline string mb_to_utf8(const string &s)
 {
     return mb_to_utf8(s.c_str());
 }
@@ -55,7 +55,7 @@ public:
     virtual ~LineInput() {}
     virtual bool eof() = 0;
     virtual bool error() { return false; };
-    virtual std::string get_line() = 0;
+    virtual string get_line() = 0;
 };
 
 class FileLineInput : public LineInput
@@ -77,7 +77,7 @@ public:
     ~FileLineInput();
     bool eof() { return seen_eof || !f; };
     bool error() { return !f; };
-    std::string get_line();
+    string get_line();
 };
 
 // The file is always UTF-8, no BOM.
@@ -91,7 +91,7 @@ public:
     ~UTF8FileLineInput();
     bool eof() { return seen_eof || !f; };
     bool error() { return !f; };
-    std::string get_line();
+    string get_line();
 };
 
 extern unsigned short charset_vt100[128];