Always use std::string in C++11.

chenshuo · Oct 24, 2018 · 1fdee54 · 1fdee54
1 parent 91c9da0
commit 1fdee54
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,6 @@ option(MUDUO_BUILD_EXAMPLES "Build Muduo examples" ON)
 set(CXX_FLAGS
  -g
  # -DVALGRIND
- # -DMUDUO_STD_STRING
  -DCHECK_PTHREAD_RETURN_VALUE
  -D_FILE_OFFSET_BITS=64
  -Wall
@@ -28,7 +27,7 @@ set(CXX_FLAGS
  -Wwrite-strings
  -march=native
  # -MMD
- -std=c++0x
+ -std=c++11
  -rdynamic
  )
 if(CMAKE_BUILD_BITS EQUAL 32)

diff --git a/examples/cdns/Resolver.h b/examples/cdns/Resolver.h
@@ -1,6 +1,7 @@
 #ifndef MUDUO_EXAMPLES_CDNS_RESOLVER_H
 #define MUDUO_EXAMPLES_CDNS_RESOLVER_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 #include <muduo/base/Timestamp.h>
 #include <muduo/net/InetAddress.h>

diff --git a/examples/curl/Curl.h b/examples/curl/Curl.h
@@ -1,6 +1,7 @@
 #ifndef MUDUO_EXAMPLES_CURL_CURL_H
 #define MUDUO_EXAMPLES_CURL_CURL_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 
 #include <muduo/net/Callbacks.h>

diff --git a/examples/procmon/plot.h b/examples/procmon/plot.h
@@ -1,3 +1,4 @@
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/Types.h>
 #include <vector>
 #include <stdlib.h> // ssize_t

diff --git a/examples/protobuf/codec/dispatcher.h b/examples/protobuf/codec/dispatcher.h
@@ -9,6 +9,7 @@
 #ifndef MUDUO_EXAMPLES_PROTOBUF_CODEC_DISPATCHER_H
 #define MUDUO_EXAMPLES_PROTOBUF_CODEC_DISPATCHER_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/net/Callbacks.h>
 
 #include <google/protobuf/message.h>

diff --git a/examples/protobuf/codec/dispatcher_lite.h b/examples/protobuf/codec/dispatcher_lite.h
@@ -9,6 +9,7 @@
 #ifndef MUDUO_EXAMPLES_PROTOBUF_CODEC_DISPATCHER_LITE_H
 #define MUDUO_EXAMPLES_PROTOBUF_CODEC_DISPATCHER_LITE_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/net/Callbacks.h>
 
 #include <google/protobuf/message.h>

diff --git a/muduo/base/FileUtil.cc b/muduo/base/FileUtil.cc
@@ -183,15 +183,3 @@ template int FileUtil::ReadSmallFile::readToString(
     string* content,
     int64_t*, int64_t*, int64_t*);
 
-#ifndef MUDUO_STD_STRING
-template int FileUtil::readFile(StringArg filename,
-                                int maxSize,
-                                std::string* content,
-                                int64_t*, int64_t*, int64_t*);
-
-template int FileUtil::ReadSmallFile::readToString(
-    int maxSize,
-    std::string* content,
-    int64_t*, int64_t*, int64_t*);
-#endif
-
diff --git a/muduo/base/FileUtil.h b/muduo/base/FileUtil.h
@@ -11,6 +11,7 @@
 #ifndef MUDUO_BASE_FILEUTIL_H
 #define MUDUO_BASE_FILEUTIL_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 #include <sys/types.h>  // for off_t
 

diff --git a/muduo/base/LogStream.h b/muduo/base/LogStream.h
@@ -1,13 +1,11 @@
 #ifndef MUDUO_BASE_LOGSTREAM_H
 #define MUDUO_BASE_LOGSTREAM_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 #include <muduo/base/Types.h>
 #include <assert.h>
 #include <string.h> // memcpy
-#ifndef MUDUO_STD_STRING
-#include <string>
-#endif
 
 namespace muduo
 {
@@ -138,14 +136,6 @@ class LogStream : noncopyable
     return *this;
   }
 
-#ifndef MUDUO_STD_STRING
-  self& operator<<(const std::string& v)
-  {
-    buffer_.append(v.c_str(), v.size());
-    return *this;
-  }
-#endif
-
   self& operator<<(const StringPiece& v)
   {
     buffer_.append(v.data(), v.size());

diff --git a/muduo/base/StringPiece.h b/muduo/base/StringPiece.h
@@ -44,9 +44,6 @@
 #include <iosfwd>    // for ostream forward-declaration
 
 #include <muduo/base/Types.h>
-#ifndef MUDUO_STD_STRING
-#include <string>
-#endif
 
 namespace muduo
 {
@@ -63,12 +60,6 @@ class StringArg // copyable
     : str_(str.c_str())
   { }
 
-#ifndef MUDUO_STD_STRING
-  StringArg(const std::string& str)
-    : str_(str.c_str())
-  { }
-#endif
-
   const char* c_str() const { return str_; }
 
  private:
@@ -93,10 +84,6 @@ class StringPiece {
       length_(static_cast<int>(strlen(ptr_))) { }
   StringPiece(const string& str)
     : ptr_(str.data()), length_(static_cast<int>(str.size())) { }
-#ifndef MUDUO_STD_STRING
-  StringPiece(const std::string& str)
-    : ptr_(str.data()), length_(static_cast<int>(str.size())) { }
-#endif
   StringPiece(const char* offset, int len)
     : ptr_(offset), length_(len) { }
 
@@ -170,12 +157,6 @@ class StringPiece {
     target->assign(ptr_, length_);
   }
 
-#ifndef MUDUO_STD_STRING
-  void CopyToStdString(std::string* target) const {
-    target->assign(ptr_, length_);
-  }
-#endif
-
   // Does "this" start with "x"
   bool starts_with(const StringPiece& x) const {
     return ((length_ >= x.length_) && (memcmp(ptr_, x.ptr_, x.length_) == 0));

diff --git a/muduo/base/TimeZone.cc b/muduo/base/TimeZone.cc
@@ -1,4 +1,5 @@
 #include <muduo/base/TimeZone.h>
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/Date.h>
 
 #include <algorithm>

diff --git a/muduo/base/Types.h b/muduo/base/Types.h
@@ -3,35 +3,25 @@
 
 #include <stdint.h>
 #include <string.h>  // memset
-#ifdef MUDUO_STD_STRING
 #include <string>
-#else  // !MUDUO_STD_STRING
-#include <ext/vstring.h>
-#include <ext/vstring_fwd.h>
-#endif
 
 #ifndef NDEBUG
 #include <assert.h>
 #endif
 
-#include <muduo/base/noncopyable.h>
-
 ///
 /// The most common stuffs.
 ///
 namespace muduo
 {
+
+using std::string;
+
 inline void memZero(void* p, size_t n)
 {
   memset(p, 0, n);
 }
 
-#ifdef MUDUO_STD_STRING
-using std::string;
-#else  // !MUDUO_STD_STRING
-typedef __gnu_cxx::__sso_string string;
-#endif
-
 // Taken from google-protobuf stubs/common.h
 //
 // Protocol Buffers - Google's data interchange format

diff --git a/muduo/net/Channel.h b/muduo/net/Channel.h
@@ -11,6 +11,7 @@
 #ifndef MUDUO_NET_CHANNEL_H
 #define MUDUO_NET_CHANNEL_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/Timestamp.h>
 
 #include <functional>

diff --git a/muduo/net/Connector.h b/muduo/net/Connector.h
@@ -11,6 +11,7 @@
 #ifndef MUDUO_NET_CONNECTOR_H
 #define MUDUO_NET_CONNECTOR_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/net/InetAddress.h>
 
 #include <functional>

diff --git a/muduo/net/TcpConnection.h b/muduo/net/TcpConnection.h
@@ -11,6 +11,7 @@
 #ifndef MUDUO_NET_TCPCONNECTION_H
 #define MUDUO_NET_TCPCONNECTION_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 #include <muduo/base/Types.h>
 #include <muduo/net/Callbacks.h>

diff --git a/muduo/net/protobuf/ProtobufCodecLite.h b/muduo/net/protobuf/ProtobufCodecLite.h
@@ -14,6 +14,7 @@
 #ifndef MUDUO_NET_PROTOBUF_PROTOBUFCODECLITE_H
 #define MUDUO_NET_PROTOBUF_PROTOBUFCODECLITE_H
 
+#include <muduo/base/noncopyable.h>
 #include <muduo/base/StringPiece.h>
 #include <muduo/base/Timestamp.h>
 #include <muduo/net/Callbacks.h>