Optimize codes to avoid compiling warning by higher version g++.

Author: zhengshuxin

lib_fiber/cpp/include/fiber/fiber_sem.hpp

@@ -1,7 +1,8 @@
 #pragma once
 #include "fiber_cpp_define.hpp"
-#include <list>
+#include <cstdlib>
 #include <cassert>
+#include <list>
 
 struct ACL_FIBER_SEM;
 
@@ -151,7 +152,7 @@ class fiber_sbox2 : public box2<T> {
 	, off_curr_(0)
 	, off_next_(0)
 	{
-		box_ = (T*) malloc(sizeof(T) * capacity_);
+		box_ = new T[capacity_];
 	}
 
 	explicit fiber_sbox2(int buf)
@@ -160,10 +161,10 @@ class fiber_sbox2 : public box2<T> {
 	, off_curr_(0)
 	, off_next_(0)
 	{
-		box_ = (T*) malloc(sizeof(T) * capacity_);
+		box_ = new T[capacity_];
 	}
 
-	~fiber_sbox2() {}
+	~fiber_sbox2() { delete []box_; }
 
 	// @override
 	bool push(T t, bool dummy = false) {
@@ -184,8 +185,18 @@ class fiber_sbox2 : public box2<T> {
 				off_next_ -= off_curr_;
 				off_curr_ = 0;
 			} else {
-				capacity_ += 10000;
-				box_ = (T*) realloc(box_, sizeof(T) * capacity_);
+				size_t capacity = capacity_ + 10000;
+				T* box = new T[capacity];
+				for (size_t i = 0; i < capacity_; i++) {
+#if __cplusplus >= 201103L || defined(USE_CPP11)
+					box[i] = std::move(box_[i]);
+#else
+					box[i] = box_[i];
+#endif
+				}
+				delete []box_;
+				box_ = box;
+				capacity_ = capacity;
 			}
 		}
 		box_[off_next_++] = t;

lib_fiber/cpp/include/fiber/fiber_tbox2.hpp

@@ -49,10 +49,10 @@ template<typename T>
 class fiber_tbox2 : public box2<T> {
 public:
 	fiber_tbox2() : capacity_(10000) , off_curr_(0) , off_next_(0) {
-		box_ = (T*) malloc(sizeof(T) * capacity_);
+		box_ = new T[capacity_];
 	}
 
-	~fiber_tbox2() { free(box_); }
+	~fiber_tbox2() { delete []box_; }
 
 	/**
 	 * Clean up unconsumed messages in the message queue.
@@ -95,8 +95,19 @@ class fiber_tbox2 : public box2<T> {
 				off_next_ -= off_curr_;
 				off_curr_ = 0;
 			} else {
-				capacity_ += 10000;
-				box_ = (T*) realloc(box_, sizeof(T) * capacity_);
+				size_t capacity = capacity_ + 10000;
+				T* box = new T[capacity];
+				for (size_t i = 0; i < capacity_; i++) {
+#if __cplusplus >= 201103L || defined(USE_CPP11)
+					box[i] = std::move(box_[i]);
+#else
+					box[i] = box_[i];
+#endif
+				}
+				delete []box_;
+				box_ = box;
+				capacity_ = capacity;
+
 			}
 		}
 #if __cplusplus >= 201103L || defined(USE_CPP11)

lib_fiber/samples-c++1x/Makefile

@@ -15,6 +15,8 @@ all:
 	@(cd client2; make)
 	@(cd fiber_connect; make)
 	@(cd fiber_tbox; make)
+	@(cd fiber_box; make)
+	@(cd fibers; make)
 cl clean:
 	@(cd fiber; make clean)
 	@(cd httpd; make clean)
@@ -32,5 +34,7 @@ cl clean:
 	@(cd client2; make clean)
 	@(cd fiber_connect; make clean)
 	@(cd fiber_tbox; make clean)
+	@(cd fiber_box; make clean)
+	@(cd fibers; make clean)
 
 rb rebuild: clean all

lib_fiber/samples-c++1x/Makefile_cpp.in

@@ -1,7 +1,7 @@
 CC      = g++
 
 CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
--Waggregate-return -Wno-long-long \
+-Wno-long-long \
 -Wpointer-arith -Werror -Wshadow -O3 \
 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_USE_FAST_MACRO