From 8a013f80994dd525e0a698befd3069d48a125646 Mon Sep 17 00:00:00 2001
From: ckormanyos <ckormanyos@yahoo.com>
Date: Sun, 1 Dec 2024 19:34:08 +0100
Subject: [PATCH] Update even more syntax

---
 ref_app/src/math/wide_decimal/decwide_t.h | 5 +++++
 ref_app/target/app/make/app_rules.gmk     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ref_app/src/math/wide_decimal/decwide_t.h b/ref_app/src/math/wide_decimal/decwide_t.h
index 14fa86545..8d22db6f3 100644
--- a/ref_app/src/math/wide_decimal/decwide_t.h
+++ b/ref_app/src/math/wide_decimal/decwide_t.h
@@ -277,8 +277,10 @@
   #if !defined(WIDE_DECIMAL_DISABLE_IOSTREAM)
   template<typename char_type, typename traits_type,
            const std::int32_t ParamDigitsBaseTen, typename LimbType, typename AllocatorType, typename InternalFloatType, typename ExponentType, typename FftFloatType> auto operator<<(std::basic_ostream<char_type, traits_type>& os, const decwide_t<ParamDigitsBaseTen, LimbType, AllocatorType, InternalFloatType, ExponentType, FftFloatType>& f) -> std::basic_ostream<char_type, traits_type>&;
+  #if !defined(WIDE_DECIMAL_DISABLE_CONSTRUCT_FROM_STRING)
   template<typename char_type, typename traits_type,
            const std::int32_t ParamDigitsBaseTen, typename LimbType, typename AllocatorType, typename InternalFloatType, typename ExponentType, typename FftFloatType> auto operator>>(std::basic_istream<char_type, traits_type>& is,       decwide_t<ParamDigitsBaseTen, LimbType, AllocatorType, InternalFloatType, ExponentType, FftFloatType>& f) -> std::basic_istream<char_type, traits_type>&;
+  #endif // !WIDE_DECIMAL_DISABLE_CONSTRUCT_FROM_STRING
   #endif // !WIDE_DECIMAL_DISABLE_IOSTREAM
 
   // Global unary operators of decwide_t reference.
@@ -4188,6 +4190,7 @@
       return (os << str);
     }
 
+    #if !defined(WIDE_DECIMAL_DISABLE_CONSTRUCT_FROM_STRING)
     template<typename char_type, typename traits_type>
     friend auto operator>>(std::basic_istream<char_type, traits_type>& is, decwide_t& f) -> std::basic_istream<char_type, traits_type>&
     {
@@ -4199,6 +4202,8 @@
 
       return is;
     }
+    #endif // !WIDE_DECIMAL_DISABLE_CONSTRUCT_FROM_STRING
+
     #endif // !WIDE_DECIMAL_DISABLE_IOSTREAM
 
     friend inline auto fabs(const decwide_t& x) -> decwide_t
diff --git a/ref_app/target/app/make/app_rules.gmk b/ref_app/target/app/make/app_rules.gmk
index 7674bacac..8737bc559 100644
--- a/ref_app/target/app/make/app_rules.gmk
+++ b/ref_app/target/app/make/app_rules.gmk
@@ -38,7 +38,7 @@ $(PATH_OBJ)/%.o : %.cpp
   # ...and generate a dependency file (using the -MM flag),
   # ...and be sure to include the path in the dependency file.
 	@-$(CC) $(CXXFLAGS) $(C_INCLUDES) $(DEP_FLAGS) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
-	@-$(SED) -e 's|:\([0-9]*\):\([0-9]*\):|(\1,\2) :|' $(PATH_ERR)/$(basename $(@F)).err
+	@-$(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|.hpp:\([0-9]*\),|.hpp(\1) :|' -e 's|.cpp:\([0-9]*\),|.cpp(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
 ifneq ($(findstr risc,$(GCC_TARGET)),)
 	@-$(OBJDUMP) -S $(PATH_OBJ)/$(basename $(@F)).o > $(PATH_LST)/$(basename $(@F)).lst
 endif