Merge branch 'master' into contest_link_80C2020

3 files changed, 6 insertions, 3 deletions

diff --git a/tools/preproc/Makefile b/tools/preproc/Makefile
index ec4a5f365..bf1c11b4b 100644
--- a/tools/preproc/Makefile
+++ b/tools/preproc/Makefile
@@ -8,7 +8,10 @@ SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
 HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \
 	utf8.h
 
-.PHONY: clean
+.PHONY: all clean
+
+all: preproc
+	@:
 
 preproc: $(SRCS) $(HEADERS)
 	$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index bb296b78b..383010aa3 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -266,7 +266,7 @@ int AsmFile::ReadString(unsigned char* s)
     {
         m_pos += stringParser.ParseString(m_pos, s, length);
     }
-    catch (std::runtime_error e)
+    catch (std::runtime_error& e)
     {
         RaiseError(e.what());
     }
diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp
index 24b3453e8..2f4bfea7c 100644
--- a/tools/preproc/c_file.cpp
+++ b/tools/preproc/c_file.cpp
@@ -206,7 +206,7 @@ void CFile::TryConvertString()
             {
                 m_pos += stringParser.ParseString(m_pos, s, length);
             }
-            catch (std::runtime_error e)
+            catch (std::runtime_error& e)
             {
                 RaiseError(e.what());
             }