Merge pull request #2382 from TheMagnetar/master

Removed pedantic errors and redefinition of M_PI variable

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")

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)

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);

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;
 

extensions/common/p3d/animation.cpp

@@ -67,5 +67,5 @@ namespace ace {
         
                 animation::~animation() {
         }
-    };
-};
+    }
+}

extensions/common/p3d/animation.hpp

@@ -65,5 +65,5 @@ namespace ace {
             //ace::vector3<float> axis_dir;
         };
         typedef std::shared_ptr<animation> animation_p;
-    };
-};
+    }
+}

extensions/common/p3d/model.hpp

@@ -53,5 +53,5 @@ namespace ace {
 
         };
         typedef std::shared_ptr<model> model_p;
-    };
-};
+    }
+}

extensions/common/p3d/model_info.hpp

@@ -70,5 +70,5 @@ namespace ace {
         };
         typedef std::shared_ptr<model_info> model_info_p;
 
-    };
-};
+    }
+}

extensions/common/p3d/parser.hpp

@@ -13,5 +13,5 @@ namespace ace {
 
             model_p load(const std::string &);
         };
-    };
-};
+    }
+}

extensions/common/p3d/skeleton.hpp

@@ -32,5 +32,5 @@ namespace ace {
             std::vector<bone_p> all_bones;
         };
         typedef std::shared_ptr<skeleton> skeleton_p;
-    };
-};
+    }
+}

extensions/common/transform_matrix.hpp

@@ -31,4 +31,4 @@ namespace ace {
     };
 
     typedef transform_matrix_base<float> transform_matrix;
-};
+}

extensions/common/vector.hpp

@@ -168,4 +168,4 @@ namespace ace {
         T _x;
         T _y;
     };
-};
+}

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);

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)
 {

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 = "";