down to C++98

Author: sunxfancy

CMakeLists.txt

@@ -20,7 +20,7 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 
-set( CMAKE_CXX_STANDARD 11)
+set( CMAKE_CXX_STANDARD 98)
 
 file(GLOB_RECURSE source_files
         ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp

include/estring.h

@@ -7,7 +7,7 @@
 #ifndef ESTRING_H
 #define ESTRING_H
 
-#include <cstdint>
+#include <stdint.h>
 #include <cstddef>
 #include <string>
 #include <vector>
@@ -22,7 +22,8 @@ class estring
 {
 public:
 	typedef std::basic_string<echar_t>::iterator iterator;
-
+	typedef std::basic_string<echar_t>::const_iterator const_iterator;
+	
 	estring();
 	estring(const std::string& str);
 	estring(const estring& estr);

src/estring.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
 * @Author: sxf
 * @Date:   2015-12-15 10:46:34
 * @Last Modified by:   sxf
@@ -61,7 +61,7 @@ const estring& estring::operator= (const std::string& str) {
 const estring& estring::operator= (const char* cstr) {
 	autoreadstr(cstr);
 	return *this;
-}	
+}
 
 const estring& estring::operator= (const echar_t* ecstr) {
 	this->data = ecstr;
@@ -96,10 +96,10 @@ void estring::readstr (const std::string& str,  const std::string& encode) {
 void estring::readstr (const char* data,  const std::string& encode) {
 	assert (data != NULL);
 	iconv_t cd = iconv_open ("UTF-16LE", encode.c_str()); // tocode, fromcode
-	if ((iconv_t)-1 == cd) { 
+	if ((iconv_t)-1 == cd) {
 		printf("不能从编码 %s 转换到 %s！\n", encode.c_str(), "UTF-16LE");
-		return; 
-	} 
+		return;
+	}
 	size_t in_size = strlen(data);
 	size_t out_size = BUFFER_SIZE;
 	size_t malloc_size = out_size;
@@ -121,7 +121,7 @@ void estring::readstr (const char* data,  const std::string& encode) {
 			} else {
 				printf ("%s\n", strerror(errno));
 				free (outbuf);
-				return; 
+				return;
 			}
 		}
 	}
@@ -149,10 +149,10 @@ std::string estring::to_utf8() {
 
 std::string estring::to_str(const std::string& encode) {
 	iconv_t cd = iconv_open (encode.c_str(), "UTF-16LE"); // tocode, fromcode
-	if ((iconv_t)-1 == cd) { 
+	if ((iconv_t)-1 == cd) {
 		printf("不能从编码 %s 转换到 %s！\n", encode.c_str(), "UTF-16LE");
-		return ""; 
-	} 
+		return "";
+	}
 	std::string _ToStr;
 	char* data = (char*)(this->data.data());
 	size_t in_size = this->data.size() * 2;
@@ -175,7 +175,7 @@ std::string estring::to_str(const std::string& encode) {
 			} else {
 				printf ("%s\n", strerror(errno));
 				free (outbuf);
-				return _ToStr = ""; 
+				return _ToStr = "";
 			}
 		}
 	}
@@ -190,10 +190,8 @@ std::string estring::to_str(const std::string& encode) {
 
 
 int estring::find(echar_t c) const {
-	int i = 0;
-	for (auto p : data) {
-		if (p == c) return i;
-		++i; 
+	for (const_iterator p = data.begin(); p != data.end(); ++p) {
+		if (*p == c) return p - data.begin();
 	}
 	return -1;
 }
@@ -230,17 +228,17 @@ estring::encodedetect (const char* data) {
 
     int size = strlen(data);
     int result = csd_consider(csd, data, size);
-    if (result < 0) 
+    if (result < 0)
         return NULL;
     return csd_close(csd);
 }
 
-std::string 
+std::string
 estring::load_full_file(const std::string& path) {
-	std::ifstream t(path);
+	std::ifstream t(path.c_str());
 	std::string str;
 
-	t.seekg(0, std::ios::end);   
+	t.seekg(0, std::ios::end);
 	str.reserve(t.tellg());
 	t.seekg(0, std::ios::beg);
 
@@ -259,4 +257,4 @@ estring::iterator estring::end() {
 
 void estring::push_back(echar_t c) {
 	data.push_back(c);
-}
+}

test_package/CMakeLists.txt

@@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 2.8)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup()
 
-set( CMAKE_CXX_STANDARD 11)
+set( CMAKE_CXX_STANDARD 98)
 add_executable(test main.cpp)
 target_link_libraries(test ${CONAN_LIBS})