1 files changed, 8 insertions, 6 deletions
diff --git a/externals/grill/flext/source/fllib.cpp b/externals/grill/flext/source/fllib.cpp
index c727bcb5..ed07a35d 100755
--- a/externals/grill/flext/source/fllib.cpp
+++ b/externals/grill/flext/source/fllib.cpp
@@ -124,21 +124,23 @@ libclass::libclass(t_class *&cl,flext_obj *(*newf)(int,t_atom *),void (*freef)(f
 	clss(cl),
 	argc(0),argv(NULL) 
 {}
-	
+
+
+typedef DataMap<const t_symbol *,libclass *> LibMap;
+
+static LibMap libnames;
+
 //! Store or retrieve registered classes
 static libclass *FindName(const t_symbol *s,libclass *o = NULL) 
 {
-    typedef std::map<const t_symbol *,libclass *> LibMap;
-
-    static LibMap libnames;
-
+//    typedef std::map<const t_symbol *,libclass *> LibMap;
     LibMap::iterator it = libnames.find(s);
     if(it == libnames.end()) {
         if(o) libnames[s] = o;
         return o;
     }
     else
-        return it->second;
+        return it.data();
 }