2 files changed, 5 insertions, 5 deletions
diff --git a/project2/basics/functions/dates.cpp b/project2/basics/functions/dates.cpp
index b19b921..91a7077 100644
--- a/project2/basics/functions/dates.cpp
+++ b/project2/basics/functions/dates.cpp
@@ -35,7 +35,7 @@ class ParseDate : public VariableImpl {
 		Variable string;
 		Variable format;
 };
-DECLARE_COMPONENT_LOADER("parsedate", ParseDate, VariableLoader);
+NAMEDFACTORY("parsedate", ParseDate, VariableFactory);
 
 class FormatDate : public VariableImpl {
 	public:
@@ -57,7 +57,7 @@ class FormatDate : public VariableImpl {
 		Variable date;
 		Variable format;
 };
-DECLARE_COMPONENT_LOADER("formatdate", FormatDate, VariableLoader);
+NAMEDFACTORY("formatdate", FormatDate, VariableFactory);
 
 class AdjustDate : public VariableImpl {
 	public:
@@ -74,7 +74,7 @@ class AdjustDate : public VariableImpl {
 		Variable date;
 		Variable offset;
 };
-DECLARE_COMPONENT_LOADER("adjustdate", AdjustDate, VariableLoader);
+NAMEDFACTORY("adjustdate", AdjustDate, VariableFactory);
 
 class CurrentDate : public VariableImpl {
 	public:
@@ -86,5 +86,5 @@ class CurrentDate : public VariableImpl {
 			return boost::posix_time::microsec_clock::universal_time();
 		}
 };
-DECLARE_COMPONENT_LOADER("currentdate", CurrentDate, VariableLoader);
+NAMEDFACTORY("currentdate", CurrentDate, VariableFactory);
 
diff --git a/project2/basics/functions/strings.cpp b/project2/basics/functions/strings.cpp
index 735a781..640cfb3 100644
--- a/project2/basics/functions/strings.cpp
+++ b/project2/basics/functions/strings.cpp
@@ -23,6 +23,6 @@ class Trim : public VariableImpl {
 	private:
 		Variable string;
 };
-DECLARE_COMPONENT_LOADER("trim", Trim, VariableLoader);
+NAMEDFACTORY("trim", Trim, VariableFactory);