Move back to C++03 standard

ttadano · Jun 14, 2017 · c6b6d41 · c6b6d41
1 parent 64d4c58
commit c6b6d41
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/anphon/kpoint.cpp b/anphon/kpoint.cpp
@@ -62,7 +62,7 @@ Kpoint::~Kpoint()
 
 void Kpoint::kpoint_setups(std::string mode)
 {
-    small_group_of_k = nullptr;
+    small_group_of_k = NULL;
     symmetry->symmetry_flag = true;
 
     unsigned int i, j;

diff --git a/anphon/relaxation.cpp b/anphon/relaxation.cpp
@@ -262,7 +262,7 @@ void Relaxation::prepare_relative_vector(std::vector<FcsArrayWithCell> fcs_in,
     unsigned int tran_tmp;
     unsigned int icount = 0;
 
-    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.cbegin(); it != fcs_in.cend(); ++it) {
+    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.begin(); it != fcs_in.end(); ++it) {
 
         atm_super.clear();
         atm_prim.clear();
@@ -316,7 +316,7 @@ void Relaxation::prepare_group_of_force_constants(std::vector<FcsArrayWithCell>
         arr_old.push_back(-1);
     }
 
-    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.cbegin(); it != fcs_in.cend(); ++it) {
+    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.begin(); it != fcs_in.end(); ++it) {
 
         arr_tmp.clear();
 
@@ -341,7 +341,7 @@ void Relaxation::prepare_group_of_force_constants(std::vector<FcsArrayWithCell>
         arr_old.push_back(-1);
     }
 
-    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.cbegin(); it != fcs_in.cend(); ++it) {
+    for (std::vector<FcsArrayWithCell>::const_iterator it = fcs_in.begin(); it != fcs_in.end(); ++it) {
 
         arr_tmp.clear();
 
@@ -2010,7 +2010,7 @@ void Relaxation::print_momentum_resolved_final_state(const unsigned int NT,
     double omega_sum[3];
     double frac;
     int knum_triangle[3];
-    std::vector<std::vector<double>> ***kplist_conserved;
+    std::vector<std::vector<double> > ***kplist_conserved;
     std::vector<KpointListWithCoordinate> ***kplist_for_target_mode;
     std::vector<double> xk_vec;
     double xk_norm[3], xk_tmp[3];
@@ -2149,8 +2149,8 @@ void Relaxation::print_momentum_resolved_final_state(const unsigned int NT,
 
             // Find a list of k points which satisfy the energy conservation
 
-            for (std::vector<KpointPlaneTriangle>::const_iterator it = kpoint->kp_planes_tri[i].cbegin();
-                 it != kpoint->kp_planes_tri[i].cend(); ++it) {
+            for (std::vector<KpointPlaneTriangle>::const_iterator it = kpoint->kp_planes_tri[i].begin();
+                 it != kpoint->kp_planes_tri[i].end(); ++it) {
 
                 // K point indexes for each triangle
                 for (k = 0; k < 3; ++k) knum_triangle[k] = (*it).knum[k];
@@ -2258,7 +2258,7 @@ void Relaxation::print_momentum_resolved_final_state(const unsigned int NT,
             for (is = 0; is < ns; ++is) {
                 for (js = 0; js < ns; ++js) {
 
-                    for (std::vector<std::vector<double>>::const_iterator it2 = kplist_conserved[is][js][0].begin();
+                    for (std::vector<std::vector<double> >::const_iterator it2 = kplist_conserved[is][js][0].begin();
                          it2 != kplist_conserved[is][js][0].end(); ++it2) {
 
                         for (k = 0; k < 3; ++k) {
@@ -2281,7 +2281,7 @@ void Relaxation::print_momentum_resolved_final_state(const unsigned int NT,
                                                      i, 0));
                     }
 
-                    for (std::vector<std::vector<double>>::const_iterator it2 = kplist_conserved[is][js][1].begin();
+                    for (std::vector<std::vector<double> >::const_iterator it2 = kplist_conserved[is][js][1].begin();
                          it2 != kplist_conserved[is][js][1].end(); ++it2) {
 
                         for (k = 0; k < 3; ++k) {
@@ -2337,7 +2337,7 @@ void Relaxation::print_momentum_resolved_final_state(const unsigned int NT,
     memory->deallocate(kplist_conserved);
 
 
-    std::vector<std::vector<double>> **final_state_xy;
+    std::vector<std::vector<double> > **final_state_xy;
     std::vector<double> triplet_xyG;
     std::vector<int> small_group_k;
     double pos_x, pos_y;