[svn] commit: r2832 - in /branches/trac320/src/lib: cc/data.cc config/ccsession.cc config/tests/fake_session.cc datasrc/data_source.cc dns/rrsetlist.cc

[BIND 10 source code commits]

Author: jreed
Date: Fri Aug 27 18:11:44 2010
New Revision: 2832

Log:
Actually tell it to return NULL.

This works-around problem with gcc 3.3.6:
	error: syntax error before `;' token

Tested on gcc 3.3.6 and gcc 4.1.3.

Modified:
    branches/trac320/src/lib/cc/data.cc
    branches/trac320/src/lib/config/ccsession.cc
    branches/trac320/src/lib/config/tests/fake_session.cc
    branches/trac320/src/lib/datasrc/data_source.cc
    branches/trac320/src/lib/dns/rrsetlist.cc

Modified: branches/trac320/src/lib/cc/data.cc
==============================================================================
--- branches/trac320/src/lib/cc/data.cc (original)
+++ branches/trac320/src/lib/cc/data.cc Fri Aug 27 18:11:44 2010
@@ -409,7 +409,7 @@
     } else {
         throwJSONError(std::string("Bad boolean value: ") + word, file, line, pos);
         // above is a throw shortcurt, return empty is never reached
-        return (ElementPtr());
+        return (ElementPtr(static_cast<Element*>(NULL)));
     }
 }
 
@@ -422,7 +422,7 @@
         return (Element::create());
     } else {
         throwJSONError(std::string("Bad null value: ") + word, file, line, pos);
-        return (ElementPtr());
+        return (ElementPtr(static_cast<Element*>(NULL)));
     }
 }
 
@@ -707,7 +707,7 @@
                 return (ce);
             }
         } else {
-            return (ElementPtr());
+            return (ElementPtr(static_cast<Element*>(NULL)));
         }
     }
 }

Modified: branches/trac320/src/lib/config/ccsession.cc
==============================================================================
--- branches/trac320/src/lib/config/ccsession.cc (original)
+++ branches/trac320/src/lib/config/ccsession.cc Fri Aug 27 18:11:44 2010
@@ -107,7 +107,7 @@
             }
         } else {
             if (rcode == 0) {
-                return (ElementPtr());
+                return (ElementPtr(static_cast<Element*>(NULL)));
             } else {
                 isc_throw(CCSessionError, "Result with rcode != 0 does not have an error description");
             }

Modified: branches/trac320/src/lib/config/tests/fake_session.cc
==============================================================================
--- branches/trac320/src/lib/config/tests/fake_session.cc (original)
+++ branches/trac320/src/lib/config/tests/fake_session.cc Fri Aug 27 18:11:44 2010
@@ -213,7 +213,7 @@
     } else {
         group = "";
         to = "";
-        return (ElementPtr());
+        return (ElementPtr(static_cast<Element*>(NULL)));
     }
 }
 

Modified: branches/trac320/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac320/src/lib/datasrc/data_source.cc (original)
+++ branches/trac320/src/lib/datasrc/data_source.cc Fri Aug 27 18:11:44 2010
@@ -640,12 +640,12 @@
     result = doQueryTask(newtask, zoneinfo, nsec3param);
     newtask.flags &= ~DataSrc::REFERRAL;
     if (result != DataSrc::SUCCESS || newtask.flags != 0) {
-        return (ConstNsec3ParamPtr());
+        return (ConstNsec3ParamPtr(static_cast<Nsec3Param*>(NULL)));
     }
 
     RRsetPtr rrset = nsec3param.findRRset(RRType::NSEC3PARAM(), q.qclass());
     if (!rrset) {
-        return (ConstNsec3ParamPtr());
+        return (ConstNsec3ParamPtr(static_cast<Nsec3Param*>(NULL)));
     }
 
     // XXX: currently only one NSEC3 chain per zone is supported;
@@ -653,7 +653,7 @@
     RdataIteratorPtr it = rrset->getRdataIterator();
     it->first();
     if (it->isLast()) {
-        return (ConstNsec3ParamPtr());
+        return (ConstNsec3ParamPtr(static_cast<Nsec3Param*>(NULL)));
     }
 
     const generic::NSEC3PARAM& np =

Modified: branches/trac320/src/lib/dns/rrsetlist.cc
==============================================================================
--- branches/trac320/src/lib/dns/rrsetlist.cc (original)
+++ branches/trac320/src/lib/dns/rrsetlist.cc Fri Aug 27 18:11:44 2010
@@ -56,7 +56,7 @@
             return (rrsetptr);
         }
     }
-    return (RRsetPtr());
+    return (RRsetPtr(static_cast<RRset*>(NULL)));
 }
 
 }