Changeset 2037

Timestamp:

02/17/11 14:00:15 (2 years ago)

Author:

ahu

Message:

phase out boost::bimap so we can depend on 1.34 again

Location:

trunk/pdns/pdns

Files:

• dnsparser.cc (modified) (1 diff)
• dnsparser.hh (modified) (5 diffs)

trunk/pdns/pdns/dnsparser.cc

@@ -179 +179 @@
 }
 
-DNSRecordContent::namemap_t& DNSRecordContent::getNamemap()
-{
-  static DNSRecordContent::namemap_t namemap;
+DNSRecordContent::n2typemap_t& DNSRecordContent::getN2Typemap()
+{
+  static DNSRecordContent::n2typemap_t namemap;
   return namemap;
 }
+
+DNSRecordContent::t2namemap_t& DNSRecordContent::getT2Namemap()
+{
+  static DNSRecordContent::t2namemap_t namemap;
+  return namemap;
+}
+
 
 DNSRecordContent::zmakermap_t& DNSRecordContent::getZmakermap()

trunk/pdns/pdns/dnsparser.hh

@@ -32 +32 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
-#include <boost/bimap.hpp>
 #include "dns.hh"
 #include "dnswriter.hh"
@@ -189 +188 @@
       getZmakermap()[make_pair(cl,ty)]=z;
 
-    getNamemap().left.insert(make_pair(make_pair(cl,ty), name));
+    getT2Namemap().insert(make_pair(make_pair(cl,ty), name));
+    getN2Typemap().insert(make_pair(name, make_pair(cl,ty)));
   }
 
@@ -201 +201 @@
   static uint16_t TypeToNumber(const string& name)
   {
-    namemap_t::right_const_iterator iter = getNamemap().right.find(name);
-    if(iter != getNamemap().right.end())
+    n2typemap_t::const_iterator iter = getN2Typemap().find(name);
+    if(iter != getN2Typemap().end())
       return iter->second.second;
     
@@ -213 +213 @@
   static const string NumberToType(uint16_t num, uint16_t classnum=1)
   {
-    namemap_t::left_const_iterator iter = getNamemap().left.find(make_pair(classnum, num));
-    if(iter == getNamemap().left.end()) 
+    t2namemap_t::const_iterator iter = getT2Namemap().find(make_pair(classnum, num));
+    if(iter == getT2Namemap().end()) 
       return "TYPE" + lexical_cast<string>(num);
       //      throw runtime_error("Unknown DNS type with numerical id "+lexical_cast<string>(num));
@@ -238 +238 @@
   typedef std::map<std::pair<uint16_t, uint16_t>, makerfunc_t* > typemap_t;
   typedef std::map<std::pair<uint16_t, uint16_t>, zmakerfunc_t* > zmakermap_t;
-  typedef boost::bimap<std::pair<uint16_t, uint16_t>, string > namemap_t;
-
+  typedef std::map<std::pair<uint16_t, uint16_t>, string > t2namemap_t;
+  typedef std::map<string, std::pair<uint16_t, uint16_t> > n2typemap_t;
   static typemap_t& getTypemap();
-  static namemap_t& getNamemap();
+  static t2namemap_t& getT2Namemap();
+  static n2typemap_t& getN2Typemap();
   static zmakermap_t& getZmakermap();
 };