Fix macros so they work inside templated code

Author: mikee47

src/include/FlashString/Object.hpp

@@ -39,7 +39,7 @@
  * @param ObjectType Fully qualified typename of object required, e.g. FSTR::String, FlashString, FSTR::Vector<int>, etc.
  * @param object Object instance to cast
  */
-#define DEFINE_FSTR_REF(name, ObjectType, object) const ObjectType& name PROGMEM = object.as<ObjectType>();
+#define DEFINE_FSTR_REF(name, ObjectType, object) const ObjectType& name PROGMEM = object.template as<ObjectType>();
 
 #define DEFINE_FSTR_REF_NAMED(name, ObjectType) DEFINE_FSTR_REF(name, ObjectType, FSTR_DATA_NAME(name).object);
 

src/include/FlashString/String.hpp

@@ -124,7 +124,7 @@ typedef const __FlashStringHelper* flash_string_t;
  */
 #define FSTR_ARRAY(name, str)                                                                                          \
 	static DEFINE_FSTR_DATA(FSTR_DATA_NAME(name), str);                                                                \
-	LOAD_FSTR(name, FSTR_DATA_NAME(name).object.as<FSTR::String>())
+	LOAD_FSTR(name, FSTR_DATA_NAME(name).object.template as<FSTR::String>())
 
 /**
  * @brief Define a FSTR::String containing data from an external file