addressing android/ndk#379

dsv101 · Apr 7, 2019 · 2680122 · 2680122
1 parent d21943a
commit 2680122
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 50 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -std=c++14")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -std=c++14")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-exceptions")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -std=c++11 -fno-exceptions")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -std=c++11 -fno-exceptions")
 
 project("IDCP")
 

diff --git a/inc/Bpm.hpp b/inc/Bpm.hpp
@@ -4,7 +4,9 @@
 #include <string>
 #include <regex>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	class Bpm
 	{
@@ -22,5 +24,6 @@ namespace idc::parser
 			std::string to_string() const;
 	};
 }
+}
 
 #endif
diff --git a/inc/Note.hpp b/inc/Note.hpp
@@ -4,7 +4,9 @@
 #include <string>
 #include <regex>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
     class Note
     {
@@ -52,5 +54,6 @@ namespace idc::parser
             std::string to_string() const;
     };
 }
+}
 
 #endif
diff --git a/inc/Song.hpp b/inc/Song.hpp
@@ -9,7 +9,9 @@
 #include <vector>
 #include <sstream>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	class Song
 	{
@@ -57,5 +59,6 @@ namespace idc::parser
 			std::string to_string() const;
 	};
 }
+}
 
 #endif
diff --git a/inc/Sud.hpp b/inc/Sud.hpp
@@ -4,7 +4,9 @@
 #include <string>
 #include <regex>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	class Sud
 	{
@@ -22,5 +24,6 @@ namespace idc::parser
 			std::string to_string() const;
 	};
 }
+}
 
 #endif
diff --git a/src/Bpm.cpp b/src/Bpm.cpp
@@ -1,7 +1,9 @@
 #include "Bpm.hpp"
 #include <sstream>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	Bpm::Bpm() :
 		val(-1.0f)
@@ -22,20 +24,13 @@ namespace idc::parser
 		{
 			//std::cerr << m[0] << " '" << m[1] << "' '" << m[2] << "' '" << m[3] << "' '"<< m[4] << "' '" << m[5] << "'" << std::endl;
 
-			try
-			{
-				this->val =
-					(m[5] != "")
-						? std::stof(m[5])
-						: (m[2] != "")
-							? std::stof(m[2])
-							: std::stof(m[1]);
-				return true;
-			}
-			catch (...)
-			{
-				return false;
-			}
+			this->val =
+				(m[5] != "")
+					? std::stof(m[5])
+					: (m[2] != "")
+						? std::stof(m[2])
+						: std::stof(m[1]);
+			return true;
 		}
 
 		return false;
@@ -54,4 +49,5 @@ namespace idc::parser
 
 		return ss.str();
 	}
+}
 }
diff --git a/src/Note.cpp b/src/Note.cpp
@@ -2,7 +2,9 @@
 #include <sstream>
 #include <iostream>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	unsigned int Note::numNotes = 0;
 
@@ -76,17 +78,10 @@ namespace idc::parser
 				this->place = 0.0f;
 			else if (this->place != 0.0f)
 			{
-				try
-				{
-					this->place = std::stof(m[6]);
-
-					if (m[7] != "")
-						this->place /= std::stof(m[7]);
-				}
-				catch(...)
-				{
-					return false;
-				}
+				this->place = std::stof(m[6]);
+
+				if (m[7] != "")
+					this->place /= std::stof(m[7]);
 			}
 
 			return true;
@@ -118,4 +113,5 @@ namespace idc::parser
 
 		return ss.str();
 	};
+}
 }
diff --git a/src/Song.cpp b/src/Song.cpp
@@ -3,7 +3,9 @@
 #include <cmath>
 #include <iostream>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	Song::Song() :
 		bpm(),
@@ -151,4 +153,5 @@ namespace idc::parser
 	}
 
 
+}
 }
diff --git a/src/Sud.cpp b/src/Sud.cpp
@@ -1,7 +1,9 @@
 #include "Sud.hpp"
 #include <sstream>
 
-namespace idc::parser
+namespace idc
+{
+namespace parser
 {
 	Sud::Sud() :
 		val(-1.0f)
@@ -22,20 +24,13 @@ namespace idc::parser
 		{
 			//std::cerr << m[0] << " '" << m[1] << "' '" << m[2] << "' '" << m[3] << "' '"<< m[4] << "' '" << m[5] << "'" << std::endl;
 
-			try
-			{
-				this->val =
-					(m[5] != "")
-						? std::stof(m[5])
-						: (m[2] != "")
-							? std::stof(m[2])
-							: std::stof(m[1]);
-				return true;
-			}
-			catch (...)
-			{
-				return false;
-			}
+			this->val =
+				(m[5] != "")
+					? std::stof(m[5])
+					: (m[2] != "")
+						? std::stof(m[2])
+						: std::stof(m[1]);
+			return true;
 		}
 
 		return false;
@@ -54,4 +49,5 @@ namespace idc::parser
 
 		return ss.str();
 	}
+}
 }