getfem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Getfem-commits] (no subject)


From: Andriy Andreykiv
Subject: [Getfem-commits] (no subject)
Date: Mon, 18 Feb 2019 10:16:12 -0500 (EST)

branch: upgrading_getfem_to_cpp14
commit 0325c78f00dd6c917d8db20c21428c1e9752256e
Author: aa <address@hidden>
Date:   Mon Feb 18 15:59:54 2019 +0100

    c-style keyword register is depreciated in the latest standards of C++
---
 src/bgeot_geometric_trans.cc | 2 +-
 src/getfem/dal_basic.h       | 6 +++---
 src/gmm/gmm_domain_decomp.h  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bgeot_geometric_trans.cc b/src/bgeot_geometric_trans.cc
index 7e89d4f..97a127b 100644
--- a/src/bgeot_geometric_trans.cc
+++ b/src/bgeot_geometric_trans.cc
@@ -279,7 +279,7 @@ namespace bgeot {
         auto itpc_j = pc.begin() + j*P, itG_b = G.begin();
         for (size_type i = 0; i < N; ++i, ++itG_b) {
           auto itG = itG_b, itpc = itpc_j;
-          register scalar_type a = *(itG) * (*itpc);
+          scalar_type a = *(itG) * (*itpc);
           for (size_type k = 1; k < P; ++k)
             { itG += N; a += *(itG) * (*++itpc); }
           *itK++ = a;
diff --git a/src/getfem/dal_basic.h b/src/getfem/dal_basic.h
index 932ca72..4a6a19a 100644
--- a/src/getfem/dal_basic.h
+++ b/src/getfem/dal_basic.h
@@ -313,9 +313,9 @@ namespace dal
     typename pointer_array::iterator ite = it+ ((last_ind + DNAMPKS__) >> pks);
     while (it != ite) {
       *it = std::unique_ptr<T[]>(new T[DNAMPKS__+1]);// 
std::make_unique<T[]>(DNAMPKS__+1);
-      register pointer p = it->get(); ++it;
-      register pointer pe = p + (DNAMPKS__+1);
-      register const_pointer pa = (ita++)->get();
+      pointer p = it->get(); ++it;
+      pointer pe = p + (DNAMPKS__+1);
+      const_pointer pa = (ita++)->get();
       while (p != pe) *p++ = *pa++;
     }
     return *this;
diff --git a/src/gmm/gmm_domain_decomp.h b/src/gmm/gmm_domain_decomp.h
index 2821f3a..fd787c3 100644
--- a/src/gmm/gmm_domain_decomp.h
+++ b/src/gmm/gmm_domain_decomp.h
@@ -81,9 +81,9 @@ namespace gmm {
     std::vector<size_type> ns(dim), na(dim), nu(dim);
     for (size_type i = 0; i < nbpts; ++i) {
       for (int k = 0; k < dim; ++k) {
-       register double a = (pts[i][k] - pmin[k]) / msize;
-       ns[k] = size_type(a) - 1; na[k] = 0;
-       pts1[k] = int(a + overlap); pts2[k] = int(ceil(a-1.0-overlap));
+          ouble a = (pts[i][k] - pmin[k]) / msize;
+          ns[k] = size_type(a) - 1; na[k] = 0;
+          pts1[k] = int(a + overlap); pts2[k] = int(ceil(a-1.0-overlap));
       }
       size_type sum = 0;
       do {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]