improve c++ quality

Author: scivision

app/allocate/interactive.cpp

@@ -1,18 +1,19 @@
 #include <iostream>
 #include <cstring>
 #include <cstdlib>
+#include <vector>
 
 #include "my_alloc.h"
 
 
 int main(){
 
-  size_t d1[1] = {1000000000};
+  std::vector<size_t> d1 = {1000000000};
 
   float *A1;
 
 
-  falloc1(&A1, d1);
+  falloc1(&A1, &d1.front());
   std::cout << "1D: allocated\n";
 
   std::cout << "press enter to deallocate 1D\n";

src/sleep/sleep.c

@@ -1,26 +1,24 @@
 #include <stdio.h>
 
-void c_sleep(int);
-
 #ifdef _MSC_VER
-
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#else
+#include <time.h>
+#include <errno.h>
+#endif
+
+
+void c_sleep(int);
 
 // https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep
 void c_sleep(int milliseconds)
 {
-  Sleep(milliseconds);
-}
 
+#ifdef _MSC_VER
+  Sleep(milliseconds);
 #else
-
-#include <time.h>
-#include <errno.h>
 // https://linux.die.net/man/3/usleep
-void c_sleep(int milliseconds)
-{
-
   if (milliseconds <= 0){
     fprintf(stderr, "ERROR:sleep: milliseconds must be strictly positive\n");
     return;
@@ -52,6 +50,6 @@ void c_sleep(int milliseconds)
     fprintf(stderr, "nanosleep() error\n");
     break;
   }
-}
-
 #endif
+
+}

src/vector/lib.c

@@ -1,6 +1,8 @@
 #include <stddef.h>
 
-void timestwo_c(int x[], int x2[], size_t N){
+#include "my_vector.h"
+
+void timestwo_c(const int x[], int x2[], const size_t N){
   for (size_t i=0; i<N; i++)
     x2[i] = x[i] * 2;
 }

src/vector/lib.cpp

@@ -4,7 +4,9 @@
 // or whatever you name this library file.
 #include <cstddef>
 
-extern "C" void timestwo_cpp(int x[], int x2[], std::size_t N){
-  for (std::size_t i=0; i<N; i++)
+#include "my_vector.h"
+
+void timestwo_cpp(const int x[], int x2[], const size_t N){
+  for (size_t i=0; i<N; i++)
     x2[i] = x[i] * 2;
 }

src/vector/mathv.f90

@@ -9,7 +9,7 @@ module mathv
 pure subroutine timestwo_f(z, z2, N) bind(c)
 ! elemental is not allowed with BIND(C)
 
-integer(C_SIZE_T), intent(in) :: N
+integer(C_SIZE_T), intent(in), value :: N
 integer(c_int),intent(in) :: z(N)
 integer(c_int),intent(out) :: z2(N)
 

src/vector/my_vector.h

@@ -2,9 +2,9 @@
 extern "C" {
 #endif
 
-void timestwo_f(int [], int [], size_t*);
-void timestwo_c(int [], int [], size_t*);
-void timestwo_cpp(int [], int [], size_t*);
+void timestwo_f(const int [], int [], const size_t);
+void timestwo_c(const int [], int [], const size_t);
+void timestwo_cpp(const int [], int [], const size_t);
 
 #ifdef __cplusplus
 }

test/array/array.f90

@@ -8,13 +8,13 @@ program array
 interface
 subroutine timestwo_c(v, N) bind(C)
 import
-integer(C_SIZE_T), intent(in) :: N
+integer(C_SIZE_T), intent(in), value :: N
 integer(C_INT), intent(inout) :: v(N)
 end subroutine
 
 subroutine timestwo_cpp(v, N) bind(C)
 import
-integer(C_SIZE_T), intent(in) :: N
+integer(C_SIZE_T), intent(in), value :: N
 integer(C_INT), intent(inout) :: v(N)
 end subroutine
 end interface

test/array/lib.c

@@ -1,10 +1,10 @@
 #include <stddef.h>
 
-void timestwo_c(int*, size_t*);
+void timestwo_c(int*, size_t);
 
-void timestwo_c(int* A, size_t* N)
+void timestwo_c(int* A, size_t N)
 {
-  for (size_t i=0; i < *N; i++){
+  for (size_t i=0; i < N; i++){
     A[i] = 2*A[i];
   }
 }

test/array/lib.cpp

@@ -1,8 +1,8 @@
 #include <cstddef>
 
-extern "C" void timestwo_cpp(int* A, size_t* N)
+extern "C" void timestwo_cpp(int* A, const size_t N)
 {
-  for (auto i=0u; i < *N; i++){
+  for (auto i=0u; i < N; i++){
     A[i] = 2*A[i];
   }
 }

test/array/main.cpp

@@ -6,13 +6,13 @@
 
 int main()
 {
-  const std::size_t Nc = 3;
-  std::size_t N = Nc;
+  const size_t Nc = 3;
+  const size_t N = Nc;
 
-  std::array<int, Nc> x = {0, 1, 2};
+  const std::array<int, Nc> x = {0, 1, 2};
   std::array<int, Nc> x2;
 
-  timestwo_f(&x.front(), &x2.front(), &N);
+  timestwo_f(&x.front(), &x2.front(), N);
 
   for (auto i=0u; i < x2.size(); i++){
     if (x2[i] != 2*x[i]){

test/malloc/main.c

@@ -14,7 +14,7 @@ int main(void)
     x[i] = i+1;
   }
 
-  timestwo_f(&x[0], &x2[0], &N);
+  timestwo_f(&x[0], &x2[0], N);
 
   for (size_t i=0; i < N; ++i){
     if (x2[i] != 2*x[i]){

test/malloc/main.cpp

@@ -7,15 +7,15 @@
 
 int main()
 {
-  std::size_t N = 3;
+  constexpr size_t N = 3;
 
   std::vector<int> x(N);
   std::vector<int> x2(N);
 
   for (size_t i = 0; i < N; ++i)
     x[i] = i+1;
 
-  timestwo_f(&x[0], &x2[0], &N);
+  timestwo_f(&x[0], &x2[0], N);
 
   for (auto i=0u; i < N; i++){
     if (x2[i] != 2 * x[i]){

test/vector/main.cpp

@@ -7,12 +7,12 @@
 int main()
 {
 
-  std::vector<int> x = {0, 1, 2};
-  auto N = x.size();
+  const std::vector<int> x = {0, 1, 2};
+  const size_t N = x.size();
 
   std::vector<int> x2(N);
 
-  timestwo_f(&x.front(), &x2.front(), &N);
+  timestwo_f(&x.front(), &x2.front(), N);
 
   for (auto i=0u; i < x2.size(); i++){
     std::cout << x2[i] << "\n";