From 4ad124d1fe1e3b083e5b8877ba8b53d4505e951d Mon Sep 17 00:00:00 2001
From: TheMagnetar <magnetar5891@gmail.com>
Date: Tue, 8 Sep 2015 21:47:16 +0200
Subject: [PATCH 1/3] M_PI was redefined in extensions/common/shared.hpp
---
extensions/advanced_ballistics/AdvancedBallistics.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp
index c5c0a6c7a3..203243cd9d 100644
--- a/extensions/advanced_ballistics/AdvancedBallistics.cpp
+++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp
@@ -5,7 +5,6 @@
#include <unordered_map>
#include <random>
-#define M_PI 3.14159265358979323846f
#define GRAVITY 9.80665f
#define ABSOLUTE_ZERO_IN_CELSIUS -273.15f
#define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS)
From dd76a67783c3c582c67d009376f11681e150097c Mon Sep 17 00:00:00 2001
From: TheMagnetar <magnetar5891@gmail.com>
Date: Tue, 8 Sep 2015 21:52:50 +0200
Subject: [PATCH 2/3] Added pedantic errors to compiling flags
---
extensions/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
index 43bd59abaf..299a9f4a5b 100644
--- a/extensions/CMakeLists.txt
+++ b/extensions/CMakeLists.txt
@@ -20,7 +20,7 @@ option(USE_STATIC_LINKING "USE_STATIC_LINKING" ON)
if(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_CXX_FLAGS "-std=c++11 -march=i686 -m32 -O2 -s -fPIC -fpermissive")
+ SET(CMAKE_CXX_FLAGS "-std=c++11 -pedantic -pedantic-errors -march=i686 -m32 -O2 -s -fPIC -fpermissive")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++")
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
From 2b80285ad77446424a020533e10e39b176b94abf Mon Sep 17 00:00:00 2001
From: TheMagnetar <magnetar5891@gmail.com>
Date: Tue, 8 Sep 2015 21:53:29 +0200
Subject: [PATCH 3/3] Removed pedantic errors. Mainly extra ';' in namespace
definitions
---
extensions/break_line/ace_break_line.cpp | 2 +-
extensions/clipboard/ace_clipboard.cpp | 2 +-
extensions/common/p3d/animation.cpp | 4 ++--
extensions/common/p3d/animation.hpp | 4 ++--
extensions/common/p3d/model.hpp | 4 ++--
extensions/common/p3d/model_info.hpp | 4 ++--
extensions/common/p3d/parser.hpp | 4 ++--
extensions/common/p3d/skeleton.hpp | 4 ++--
extensions/common/transform_matrix.hpp | 2 +-
extensions/common/vector.hpp | 2 +-
extensions/fcs/ace_fcs.cpp | 2 +-
extensions/medical/medical.cpp | 2 +-
extensions/parse_imagepath/ace_parse_imagepath.cpp | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/extensions/break_line/ace_break_line.cpp b/extensions/break_line/ace_break_line.cpp
index 8bb5af9572..7644748378 100644
--- a/extensions/break_line/ace_break_line.cpp
+++ b/extensions/break_line/ace_break_line.cpp
@@ -21,7 +21,7 @@
extern "C" {
EXPORT void __stdcall RVExtension(char *output, int outputSize, const char *function);
-};
+}
std::vector<std::string> splitString(const std::string & input) {
std::istringstream ss(input);
diff --git a/extensions/clipboard/ace_clipboard.cpp b/extensions/clipboard/ace_clipboard.cpp
index 61960598ec..cdd5f7c423 100644
--- a/extensions/clipboard/ace_clipboard.cpp
+++ b/extensions/clipboard/ace_clipboard.cpp
@@ -15,7 +15,7 @@
extern "C" {
EXPORT void __stdcall RVExtension(char *output, int outputSize, const char *function);
-};
+}
std::string gClipboardData;
diff --git a/extensions/common/p3d/animation.cpp b/extensions/common/p3d/animation.cpp
index f47a40fe5a..07f5922f49 100644
--- a/extensions/common/p3d/animation.cpp
+++ b/extensions/common/p3d/animation.cpp
@@ -67,5 +67,5 @@ namespace ace {
animation::~animation() {
}
- };
-};
+ }
+}
diff --git a/extensions/common/p3d/animation.hpp b/extensions/common/p3d/animation.hpp
index b53bee6a68..430f3aed6d 100644
--- a/extensions/common/p3d/animation.hpp
+++ b/extensions/common/p3d/animation.hpp
@@ -65,5 +65,5 @@ namespace ace {
//ace::vector3<float> axis_dir;
};
typedef std::shared_ptr<animation> animation_p;
- };
-};
\ No newline at end of file
+ }
+}
diff --git a/extensions/common/p3d/model.hpp b/extensions/common/p3d/model.hpp
index bd3cafe60c..a26a8cfbb8 100644
--- a/extensions/common/p3d/model.hpp
+++ b/extensions/common/p3d/model.hpp
@@ -53,5 +53,5 @@ namespace ace {
};
typedef std::shared_ptr<model> model_p;
- };
-};
\ No newline at end of file
+ }
+}
diff --git a/extensions/common/p3d/model_info.hpp b/extensions/common/p3d/model_info.hpp
index 195e925a5a..f785574411 100644
--- a/extensions/common/p3d/model_info.hpp
+++ b/extensions/common/p3d/model_info.hpp
@@ -70,5 +70,5 @@ namespace ace {
};
typedef std::shared_ptr<model_info> model_info_p;
- };
-};
\ No newline at end of file
+ }
+}
diff --git a/extensions/common/p3d/parser.hpp b/extensions/common/p3d/parser.hpp
index b3f584a017..76a2d2f8e1 100644
--- a/extensions/common/p3d/parser.hpp
+++ b/extensions/common/p3d/parser.hpp
@@ -13,5 +13,5 @@ namespace ace {
model_p load(const std::string &);
};
- };
-};
\ No newline at end of file
+ }
+}
diff --git a/extensions/common/p3d/skeleton.hpp b/extensions/common/p3d/skeleton.hpp
index 86fa71c49c..2b66c4fc6c 100644
--- a/extensions/common/p3d/skeleton.hpp
+++ b/extensions/common/p3d/skeleton.hpp
@@ -32,5 +32,5 @@ namespace ace {
std::vector<bone_p> all_bones;
};
typedef std::shared_ptr<skeleton> skeleton_p;
- };
-};
\ No newline at end of file
+ }
+}
diff --git a/extensions/common/transform_matrix.hpp b/extensions/common/transform_matrix.hpp
index f9c3056dc9..73dad45019 100644
--- a/extensions/common/transform_matrix.hpp
+++ b/extensions/common/transform_matrix.hpp
@@ -31,4 +31,4 @@ namespace ace {
};
typedef transform_matrix_base<float> transform_matrix;
-};
\ No newline at end of file
+}
diff --git a/extensions/common/vector.hpp b/extensions/common/vector.hpp
index 0eb348f312..3f786a964f 100644
--- a/extensions/common/vector.hpp
+++ b/extensions/common/vector.hpp
@@ -168,4 +168,4 @@ namespace ace {
T _x;
T _y;
};
-};
+}
diff --git a/extensions/fcs/ace_fcs.cpp b/extensions/fcs/ace_fcs.cpp
index 178711f54c..5bc750235e 100644
--- a/extensions/fcs/ace_fcs.cpp
+++ b/extensions/fcs/ace_fcs.cpp
@@ -27,7 +27,7 @@
extern "C" {
EXPORT void __stdcall RVExtension(char *output, int outputSize, const char *function);
-};
+}
std::vector<std::string> splitString(std::string input) {
std::istringstream ss(input);
diff --git a/extensions/medical/medical.cpp b/extensions/medical/medical.cpp
index 3dcf3196ab..6ec8791b2b 100644
--- a/extensions/medical/medical.cpp
+++ b/extensions/medical/medical.cpp
@@ -14,7 +14,7 @@
extern "C" {
EXPORT void __stdcall RVExtension(char *output, int outputSize, const char *function);
-};
+}
std::vector<std::string> parseExtensionInput(const std::string& input)
{
diff --git a/extensions/parse_imagepath/ace_parse_imagepath.cpp b/extensions/parse_imagepath/ace_parse_imagepath.cpp
index 051535e473..56d503cbaf 100644
--- a/extensions/parse_imagepath/ace_parse_imagepath.cpp
+++ b/extensions/parse_imagepath/ace_parse_imagepath.cpp
@@ -18,7 +18,7 @@
extern "C" {
__declspec (dllexport) void __stdcall RVExtension(char *output, int outputSize, const char *function);
-};
+}
std::string getImagePathFromStructuredText(const std::string & input) {
std::string returnValue = "";