From 0d8df25704366f3576c417436c90fbac2e479632 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 3 Aug 2013 15:24:01 +0300
Subject: [PATCH] Replace local RAII set utility with one from mspcore

---
 source/loader.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/source/loader.cpp b/source/loader.cpp
index 2c0fbd1..c2de401 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include "dataerror.h"
 #include "loader.h"
@@ -7,16 +8,6 @@ using namespace std;
 
 namespace {
 
-template<typename T>
-struct Set
-{
-	T &ref;
-	T orig;
-
-	Set(T &r, const T &v): ref(r), orig(r) { r = v; }
-	~Set() { ref = orig; }
-};
-
 bool signature_match(char s, char a)
 {
 	if(s==a)
@@ -109,7 +100,7 @@ void Loader::load(const Statement &st)
 
 void Loader::load_statement(const Statement &st)
 {
-	Set<const Statement *> set_cst(cur_st, &st);
+	SetForScope<const Statement *> set_cst(cur_st, &st);
 
 	try
 	{
-- 
2.43.0