From 3b3041e405352656e76c175da8a6dc1ba299da5e Mon Sep 17 00:00:00 2001
From: Vitor Fernandes <vitor.fernandes@jumo.world>
Date: Tue, 7 Jul 2020 17:40:41 +0100
Subject: [PATCH] Refactor code, uniform names clean warning messages and setup
 c++ compiler to c11

---
 CMakeLists.txt             | 3 +++
 src/cpu/avx2.cpp           | 6 ++++--
 src/cpu/avx2.hpp           | 4 +---
 src/cpu/demos/sse.cpp      | 2 +-
 src/cpu/naive.cpp          | 2 +-
 src/cpu/naive.hpp          | 7 +------
 src/cpu/sse.cpp            | 4 ++--
 src/cpu/sse.hpp            | 4 +---
 src/cpu/utils.hpp          | 6 +++---
 src/opengl/Shader.cpp      | 2 --
 src/opengl/VertexArray.cpp | 2 +-
 11 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82e962c..9e2ee65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+#Set c++ c11 version
+set (CMAKE_CXX_STANDARD 11)
+
 add_subdirectory(src)
 #add_executable(c_time time.cpp)
 
diff --git a/src/cpu/avx2.cpp b/src/cpu/avx2.cpp
index cb0c724..46f285f 100644
--- a/src/cpu/avx2.cpp
+++ b/src/cpu/avx2.cpp
@@ -2,11 +2,13 @@
 #include <iostream>
 #include <string>
 
-void Cpu::avx2::avx_sum(int *a, int *b)
+using namespace std;
+
+void CPU::avx2::avx_sum(int *a, int *b)
 {
 }
 
-void Cpu::avx2::printAVX2Num(int *num)
+void CPU::avx2::printAVX2Num(int *num)
 {
     for (int i = 0; i < avx2::AVX2_INT_SIZE; i++)
     {
diff --git a/src/cpu/avx2.hpp b/src/cpu/avx2.hpp
index ba7b045..cf63283 100644
--- a/src/cpu/avx2.hpp
+++ b/src/cpu/avx2.hpp
@@ -1,7 +1,5 @@
 #pragma once
-
-using namespace std;
-namespace Cpu
+namespace CPU
 {
 class avx2
 {
diff --git a/src/cpu/demos/sse.cpp b/src/cpu/demos/sse.cpp
index 4c202e8..2a2f722 100644
--- a/src/cpu/demos/sse.cpp
+++ b/src/cpu/demos/sse.cpp
@@ -4,7 +4,7 @@
 #include "../naive.hpp"
 #include <sys/time.h>
 
-using namespace Cpu;
+using namespace CPU;
 using namespace std;
 
 long int gettime(){
diff --git a/src/cpu/naive.cpp b/src/cpu/naive.cpp
index 3ce8da5..a9e1d3e 100644
--- a/src/cpu/naive.cpp
+++ b/src/cpu/naive.cpp
@@ -2,7 +2,7 @@
 #include "types.hpp"
 #include <iostream>
 
-void Cpu::Naive::sum_128_long(UInt *a,UInt *b){
+void CPU::Naive::sum_128_long(UInt *a,UInt *b){
     ULong a1 = ((ULong)a[0] << 32) | a[1];
     ULong a2 = ((ULong)a[2] << 32) | a[3];
     ULong b1 = ((ULong)b[0] << 32) | b[1];
diff --git a/src/cpu/naive.hpp b/src/cpu/naive.hpp
index e6cabad..69f1d65 100644
--- a/src/cpu/naive.hpp
+++ b/src/cpu/naive.hpp
@@ -1,12 +1,7 @@
 #pragma once
 
 #include "types.hpp"
-
-using namespace std;
-/**
- * This will define a set of functions 
- */
-namespace Cpu
+namespace CPU
 {
 class Naive
 {
diff --git a/src/cpu/sse.cpp b/src/cpu/sse.cpp
index 9db8e3d..96673d3 100644
--- a/src/cpu/sse.cpp
+++ b/src/cpu/sse.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 
 //X86 Assembly to add two 128 bit numbers in the form of packed integers 32bit
-void Cpu::SSE::paddw(UInt *a,UInt *b) {
+void CPU::SSE::paddw(UInt *a,UInt *b) {
     asm(
         "movdqa %0, %%xmm1\n"
         "paddw %1, %%xmm1\n"
@@ -14,7 +14,7 @@ void Cpu::SSE::paddw(UInt *a,UInt *b) {
 
 
 //X86 Assembly to add two 128 bit numbers in the form of packed long 64bit
-void Cpu::SSE::paddd(ULong *a,ULong *b) {
+void CPU::SSE::paddd(ULong *a,ULong *b) {
     asm(
         "movdqa %0, %%xmm1\n"
         "paddd %1, %%xmm1\n"
diff --git a/src/cpu/sse.hpp b/src/cpu/sse.hpp
index 479bb1c..8e218d7 100644
--- a/src/cpu/sse.hpp
+++ b/src/cpu/sse.hpp
@@ -2,10 +2,8 @@
 
 #include "types.hpp"
 
-using namespace std;
 
-
-namespace Cpu
+namespace CPU
 {
 class SSE
 {
diff --git a/src/cpu/utils.hpp b/src/cpu/utils.hpp
index 2e1b1b5..a595320 100644
--- a/src/cpu/utils.hpp
+++ b/src/cpu/utils.hpp
@@ -5,7 +5,7 @@
 
 using namespace std;
 
-namespace Cpu
+namespace CPU
 {
 class Utils
 {
@@ -39,11 +39,11 @@ public:
     static void long128BitToInt(ULong *packedULong, UInt *packedUInteger)
     {
         //Unpack first long
-        packedUInteger[0] = packedULong[0] && MASK_32;
+        packedUInteger[0] = packedULong[0] & MASK_32;
         packedUInteger[1] = packedULong[0] >> SHIFT_32;
 
         //Unpack second long
-        packedUInteger[2] = packedULong[1] && MASK_32;
+        packedUInteger[2] = packedULong[1] & MASK_32;
         packedUInteger[3] = packedULong[1] >> SHIFT_32;
     };
 };
diff --git a/src/opengl/Shader.cpp b/src/opengl/Shader.cpp
index 604257e..9d03d8e 100644
--- a/src/opengl/Shader.cpp
+++ b/src/opengl/Shader.cpp
@@ -1,5 +1,3 @@
-#pragma once
-
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/src/opengl/VertexArray.cpp b/src/opengl/VertexArray.cpp
index 2c0e121..9ec3f4a 100644
--- a/src/opengl/VertexArray.cpp
+++ b/src/opengl/VertexArray.cpp
@@ -23,7 +23,7 @@ void VertexArray::AddBuffer(const VertexBuffer &vb, const VertexBufferLayout& la
   {
     const auto &element = elements[i];
     GLCall(glEnableVertexAttribArray(i));
-    GLCall(glVertexAttribPointer(i, elements[i].count, element.type,element.normalized, layout.GetStride(), (const void*)offset));
+    GLCall(glVertexAttribPointer(i, elements[i].count, element.type,element.normalized, layout.GetStride(), (const void*) &offset));
     offset+=element.count * VertexBufferElement::GetSizeOfType(element.type); 
   }
 }