Changeset 612 for trunk/pdns/pdns/dnsparser.hh

Timestamp:

03/22/06 18:47:01 (4 years ago)

Author:

ahu

Message:

big bag 'o Solaris fixes! (partially sent by Juergen Georgi)
pdns_recursor not only compiles (although you still need LIBS="-lnsl -lsocket -lresolv") but works too
Fixes the famous "‘init_priority’ attribute is not supported on this platform"

Files:

• trunk/pdns/pdns/dnsparser.hh (modified) (3 diffs)

trunk/pdns/pdns/dnsparser.hh

@@ -180 +180 @@
   {
     if(f)
-      typemap[make_pair(cl,ty)]=f;
+      getTypemap()[make_pair(cl,ty)]=f;
     if(z)
-      zmakermap[make_pair(cl,ty)]=z;
-
-    namemap[make_pair(cl,ty)]=name;
+      getZmakermap()[make_pair(cl,ty)]=z;
+
+    getNamemap()[make_pair(cl,ty)]=name;
   }
 
   static uint16_t TypeToNumber(const string& name)
   {
-    for(namemap_t::const_iterator i=namemap.begin(); i!=namemap.end();++i)
+    for(namemap_t::const_iterator i=getNamemap().begin(); i!=getNamemap().end();++i)
       if(!strcasecmp(i->second.c_str(), name.c_str()))
         return i->first.second;
@@ -198 +198 @@
   static const string NumberToType(uint16_t num)
   {
-    if(!namemap.count(make_pair(1,num)))
+    if(!getNamemap().count(make_pair(1,num)))
       return "#" + lexical_cast<string>(num);
       //      throw runtime_error("Unknown DNS type with numerical id "+lexical_cast<string>(num));
-    return namemap[make_pair(1,num)];
+    return getNamemap()[make_pair(1,num)];
   }
 
@@ -210 +210 @@
 protected:
   typedef std::map<std::pair<uint16_t, uint16_t>, makerfunc_t* > typemap_t;
-  static typemap_t typemap;
-
   typedef std::map<std::pair<uint16_t, uint16_t>, zmakerfunc_t* > zmakermap_t;
-  static zmakermap_t zmakermap;
-
   typedef std::map<std::pair<uint16_t, uint16_t>, string > namemap_t;
-  static namemap_t namemap;
+
+  static typemap_t& getTypemap();
+  static namemap_t& getNamemap();
+  static zmakermap_t& getZmakermap();
 };