提交 93708d78 编写于 作者: Y youngwolf

Downgrade the requirement of C++ standard (to C++0x only).

上级 5f551d08
cflag = -Wall -fexceptions cflag = -Wall -fexceptions -std=c++0x
ifeq (${MAKECMDGOALS}, debug) ifeq (${MAKECMDGOALS}, debug)
cflag += -g -DDEBUG cflag += -g -DDEBUG
else else
......
...@@ -883,14 +883,14 @@ template <typename T> inline T safe_execute(const std::shared_ptr<data_exp<T>>& ...@@ -883,14 +883,14 @@ template <typename T> inline T safe_execute(const std::shared_ptr<data_exp<T>>&
dexps.push_back(std::make_pair(dexp, true)); dexps.push_back(std::make_pair(dexp, true));
std::list<immediate_data<T>> res; std::list<immediate_data<T>> res;
auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left
for (auto iter = std::crbegin(dexps); iter != std::crend(dexps);) for (auto iter = dexps.crbegin(); iter != dexps.crend();)
if (0 == direction) if (0 == direction)
{ {
auto data = iter->first->get_1st_data(); auto data = iter->first->get_1st_data();
if (data->is_composite()) if (data->is_composite())
{ {
dexps.push_back(std::make_pair(data, true)); dexps.push_back(std::make_pair(data, true));
iter = std::crbegin(dexps); iter = dexps.crbegin();
} }
else else
{ {
...@@ -904,7 +904,7 @@ template <typename T> inline T safe_execute(const std::shared_ptr<data_exp<T>>& ...@@ -904,7 +904,7 @@ template <typename T> inline T safe_execute(const std::shared_ptr<data_exp<T>>&
if (data->is_composite()) if (data->is_composite())
{ {
dexps.push_back(std::make_pair(data, false)); dexps.push_back(std::make_pair(data, false));
iter = std::crbegin(dexps); iter = dexps.crbegin();
direction = 0; direction = 0;
} }
else else
...@@ -940,14 +940,14 @@ template <typename T> inline void safe_delete(const std::shared_ptr<data_exp<T>> ...@@ -940,14 +940,14 @@ template <typename T> inline void safe_delete(const std::shared_ptr<data_exp<T>>
std::list<std::pair<std::shared_ptr<data_exp<T>>, bool>> dexps; //true - left branch, false - right branch std::list<std::pair<std::shared_ptr<data_exp<T>>, bool>> dexps; //true - left branch, false - right branch
dexps.push_back(std::make_pair(dexp, true)); dexps.push_back(std::make_pair(dexp, true));
auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left
for (auto iter = std::crbegin(dexps); iter != std::crend(dexps);) for (auto iter = dexps.crbegin(); iter != dexps.crend();)
if (0 == direction) if (0 == direction)
{ {
auto data = iter->first->get_1st_data(); auto data = iter->first->get_1st_data();
if (data->is_composite()) if (data->is_composite())
{ {
dexps.push_back(std::make_pair(data, true)); dexps.push_back(std::make_pair(data, true));
iter = std::crbegin(dexps); iter = dexps.crbegin();
} }
else else
{ {
...@@ -961,7 +961,7 @@ template <typename T> inline void safe_delete(const std::shared_ptr<data_exp<T>> ...@@ -961,7 +961,7 @@ template <typename T> inline void safe_delete(const std::shared_ptr<data_exp<T>>
if (data->is_composite()) if (data->is_composite())
{ {
dexps.push_back(std::make_pair(data, false)); dexps.push_back(std::make_pair(data, false));
iter = std::crbegin(dexps); iter = dexps.crbegin();
direction = 0; direction = 0;
} }
else else
...@@ -1024,14 +1024,14 @@ template <typename T> inline bool safe_execute(const std::shared_ptr<judge_exp<T ...@@ -1024,14 +1024,14 @@ template <typename T> inline bool safe_execute(const std::shared_ptr<judge_exp<T
jexps.push_back(std::make_pair(jexp, true)); jexps.push_back(std::make_pair(jexp, true));
auto re = false; auto re = false;
auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left
for (auto iter = std::crbegin(jexps); iter != std::crend(jexps);) for (auto iter = jexps.crbegin(); iter != jexps.crend();)
if (0 == direction) if (0 == direction)
{ {
auto judge = iter->first->get_1st_judge(); auto judge = iter->first->get_1st_judge();
if (judge->is_composite()) if (judge->is_composite())
{ {
jexps.push_back(std::make_pair(judge, true)); jexps.push_back(std::make_pair(judge, true));
iter = std::crbegin(jexps); iter = jexps.crbegin();
} }
else else
{ {
...@@ -1056,7 +1056,7 @@ template <typename T> inline bool safe_execute(const std::shared_ptr<judge_exp<T ...@@ -1056,7 +1056,7 @@ template <typename T> inline bool safe_execute(const std::shared_ptr<judge_exp<T
if (judge->is_composite()) if (judge->is_composite())
{ {
jexps.push_back(std::make_pair(judge, false)); jexps.push_back(std::make_pair(judge, false));
iter = std::crbegin(jexps); iter = jexps.crbegin();
direction = 0; direction = 0;
} }
else else
...@@ -1083,14 +1083,14 @@ template <typename T> inline void safe_delete(const std::shared_ptr<judge_exp<T> ...@@ -1083,14 +1083,14 @@ template <typename T> inline void safe_delete(const std::shared_ptr<judge_exp<T>
std::list<std::pair<std::shared_ptr<judge_exp<T>>, bool>> jexps; //true - left branch, false - right branch std::list<std::pair<std::shared_ptr<judge_exp<T>>, bool>> jexps; //true - left branch, false - right branch
jexps.push_back(std::make_pair(jexp, true)); jexps.push_back(std::make_pair(jexp, true));
auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left auto direction = 0; //0 - left-bottom, 1 - right-bottom, 2 - top-left
for (auto iter = std::crbegin(jexps); iter != std::crend(jexps);) for (auto iter = jexps.crbegin(); iter != jexps.crend();)
if (0 == direction) if (0 == direction)
{ {
auto judge = iter->first->get_1st_judge(); auto judge = iter->first->get_1st_judge();
if (judge->is_composite()) if (judge->is_composite())
{ {
jexps.push_back(std::make_pair(judge, true)); jexps.push_back(std::make_pair(judge, true));
iter = std::crbegin(jexps); iter = jexps.crbegin();
} }
else else
{ {
...@@ -1104,7 +1104,7 @@ template <typename T> inline void safe_delete(const std::shared_ptr<judge_exp<T> ...@@ -1104,7 +1104,7 @@ template <typename T> inline void safe_delete(const std::shared_ptr<judge_exp<T>
if (judge->is_composite()) if (judge->is_composite())
{ {
jexps.push_back(std::make_pair(judge, false)); jexps.push_back(std::make_pair(judge, false));
iter = std::crbegin(jexps); iter = jexps.crbegin();
direction = 0; direction = 0;
} }
else else
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册