[svn] commit: r735 - in /branches/parkinglot: ./ src/bin/auth/ src/bin/host/ src/bin/parkinglot/ src/lib/ src/lib/auth/cpp/ src/lib/cc/cpp/ src/lib/config/cpp/ src/lib/dns/cpp/ src/lib/dns/cpp/rdata/ch_3/ src/lib/dns/cpp/rdata/generic/ src/lib/dns/cpp/rdata/hs_4/ src/lib/dns/cpp/rdata/in_1/ src/lib/exceptions/ src/lib/exceptions/cpp/

BIND 10 source code commits bind10-changes at lists.isc.org
Fri Feb 5 11:09:38 UTC 2010


Author: jelte
Date: Fri Feb  5 11:09:38 2010
New Revision: 735

Log:
moved exceptions out of libdns and created libexceptions

don't forget to make clean and autoreconf again

Added:
    branches/parkinglot/src/lib/exceptions/
    branches/parkinglot/src/lib/exceptions/Makefile.am
    branches/parkinglot/src/lib/exceptions/cpp/
    branches/parkinglot/src/lib/exceptions/cpp/exceptions.cc
      - copied, changed from r734, branches/parkinglot/src/lib/dns/cpp/exceptions.cc
    branches/parkinglot/src/lib/exceptions/cpp/exceptions.h
      - copied, changed from r734, branches/parkinglot/src/lib/dns/cpp/exceptions.h
    branches/parkinglot/src/lib/exceptions/cpp/exceptions_unittest.cc
      - copied, changed from r734, branches/parkinglot/src/lib/dns/cpp/exceptions_unittest.cc
    branches/parkinglot/src/lib/exceptions/cpp/run_unittests.cc
Removed:
    branches/parkinglot/src/lib/dns/cpp/exceptions.cc
    branches/parkinglot/src/lib/dns/cpp/exceptions.h
    branches/parkinglot/src/lib/dns/cpp/exceptions_unittest.cc
Modified:
    branches/parkinglot/Makefile.am
    branches/parkinglot/configure.ac
    branches/parkinglot/src/bin/auth/Makefile.am
    branches/parkinglot/src/bin/host/Makefile.am
    branches/parkinglot/src/bin/parkinglot/Makefile.am
    branches/parkinglot/src/lib/Makefile.am
    branches/parkinglot/src/lib/auth/cpp/query.h
    branches/parkinglot/src/lib/cc/cpp/Makefile.am
    branches/parkinglot/src/lib/cc/cpp/data.h
    branches/parkinglot/src/lib/config/cpp/Makefile.am
    branches/parkinglot/src/lib/dns/cpp/Makefile.am
    branches/parkinglot/src/lib/dns/cpp/base64.cc
    branches/parkinglot/src/lib/dns/cpp/base64.h
    branches/parkinglot/src/lib/dns/cpp/buffer.h
    branches/parkinglot/src/lib/dns/cpp/message.h
    branches/parkinglot/src/lib/dns/cpp/name.h
    branches/parkinglot/src/lib/dns/cpp/rdata.h
    branches/parkinglot/src/lib/dns/cpp/rdata/ch_3/a_1.cc
    branches/parkinglot/src/lib/dns/cpp/rdata/generic/mx_15.cc
    branches/parkinglot/src/lib/dns/cpp/rdata/generic/soa_6.cc
    branches/parkinglot/src/lib/dns/cpp/rdata/hs_4/a_1.cc
    branches/parkinglot/src/lib/dns/cpp/rdata/in_1/a_1.cc
    branches/parkinglot/src/lib/dns/cpp/rdata/in_1/aaaa_28.cc
    branches/parkinglot/src/lib/dns/cpp/rrclass-placeholder.h
    branches/parkinglot/src/lib/dns/cpp/rrclass.cc
    branches/parkinglot/src/lib/dns/cpp/rrparamregistry-placeholder.cc
    branches/parkinglot/src/lib/dns/cpp/rrparamregistry.h
    branches/parkinglot/src/lib/dns/cpp/rrttl.h
    branches/parkinglot/src/lib/dns/cpp/rrtype-placeholder.h
    branches/parkinglot/src/lib/dns/cpp/rrtype.cc

Modified: branches/parkinglot/Makefile.am
==============================================================================
--- branches/parkinglot/Makefile.am (original)
+++ branches/parkinglot/Makefile.am Fri Feb  5 11:09:38 2010
@@ -44,6 +44,7 @@
 	ln -s ${abs_top_srcdir}/src/lib/cc/cpp include/cc
 	ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config
 	ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns
+	ln -s ${abs_top_srcdir}/src/lib/exceptions/cpp include/exceptions
 
 stree_symlinks:	pyshared include
 .PHONY: stree_symlinks

Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Fri Feb  5 11:09:38 2010
@@ -163,6 +163,8 @@
                  src/lib/config/python/isc/config/Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/cpp/Makefile
+                 src/lib/exceptions/cpp/Makefile
+                 src/lib/exceptions/Makefile
                  src/lib/auth/Makefile
                  src/lib/auth/cpp/Makefile
                ])

Modified: branches/parkinglot/src/bin/auth/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/auth/Makefile.am (original)
+++ branches/parkinglot/src/bin/auth/Makefile.am Fri Feb  5 11:09:38 2010
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
@@ -10,6 +10,7 @@
 b10_auth_LDADD +=  $(top_builddir)/src/lib/auth/cpp/.libs/libauth.a
 b10_auth_LDADD += $(top_builddir)/src/lib/config/cpp/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
+b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
 
 # TODO: config.h.in is wrong because doesn't honor pkgdatadir
 # and can't use @datadir@ because doesn't expand default ${prefix}

Modified: branches/parkinglot/src/bin/host/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/host/Makefile.am (original)
+++ branches/parkinglot/src/bin/host/Makefile.am Fri Feb  5 11:09:38 2010
@@ -3,3 +3,4 @@
 bin_PROGRAMS = host
 host_SOURCES = host.cc
 host_LDADD = $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
+host_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a

Modified: branches/parkinglot/src/bin/parkinglot/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/parkinglot/Makefile.am (original)
+++ branches/parkinglot/src/bin/parkinglot/Makefile.am Fri Feb  5 11:09:38 2010
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
@@ -12,6 +12,7 @@
 b10_parkinglot_LDADD =  $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
 b10_parkinglot_LDADD += $(top_builddir)/src/lib/config/cpp/libcfgclient.a
 b10_parkinglot_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
+b10_parkinglot_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
 
 b10_parkinglotdir = $(DESTDIR)$(pkgdatadir)
 b10_parkinglot_DATA = parkinglot.spec
@@ -20,3 +21,4 @@
 bin_PROGRAMS = builtin_bench
 builtin_bench_SOURCES = builtin_bench.cc builtin.h builtin.cc
 builtin_bench_LDADD = $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
+builtin_bench_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a

Modified: branches/parkinglot/src/lib/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/Makefile.am (original)
+++ branches/parkinglot/src/lib/Makefile.am Fri Feb  5 11:09:38 2010
@@ -1,1 +1,1 @@
-SUBDIRS = dns cc config auth
+SUBDIRS = exceptions dns cc config auth

Modified: branches/parkinglot/src/lib/auth/cpp/query.h
==============================================================================
--- branches/parkinglot/src/lib/auth/cpp/query.h (original)
+++ branches/parkinglot/src/lib/auth/cpp/query.h Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 
 #include <queue>
 
-#include <dns/exceptions.h>
+#include <exceptions/exceptions.h>
 #include <dns/name.h>
 #include <dns/message.h>
 #include <dns/rrset.h>
@@ -42,7 +42,7 @@
 class MalformedMessage : public Exception {
 public:
     MalformedMessage(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 // An individual task to be carried out by the query logic

Modified: branches/parkinglot/src/lib/cc/cpp/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/cc/cpp/Makefile.am (original)
+++ branches/parkinglot/src/lib/cc/cpp/Makefile.am Fri Feb  5 11:09:38 2010
@@ -11,6 +11,7 @@
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = libcc.a $(GTEST_LDADD)
 run_unittests_LDADD +=  $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
+run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
 endif
 
 noinst_PROGRAMS = $(TESTS)

Modified: branches/parkinglot/src/lib/cc/cpp/data.h
==============================================================================
--- branches/parkinglot/src/lib/cc/cpp/data.h (original)
+++ branches/parkinglot/src/lib/cc/cpp/data.h Fri Feb  5 11:09:38 2010
@@ -22,7 +22,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <stdexcept>
-#include <dns/exceptions.h>
+#include <exceptions/exceptions.h>
 
 namespace isc { namespace data {
 
@@ -36,10 +36,10 @@
 /// ListElement)
 ///
 // todo: include types and called function in the exception
-class TypeError : public isc::dns::Exception {
+class TypeError : public isc::Exception {
 public:
     TypeError(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///

Modified: branches/parkinglot/src/lib/config/cpp/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/config/cpp/Makefile.am (original)
+++ branches/parkinglot/src/lib/config/cpp/Makefile.am Fri Feb  5 11:09:38 2010
@@ -10,7 +10,7 @@
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = libcfgclient.a $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/cpp/libdns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/libexceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
 endif
 

Modified: branches/parkinglot/src/lib/dns/cpp/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/Makefile.am (original)
+++ branches/parkinglot/src/lib/dns/cpp/Makefile.am Fri Feb  5 11:09:38 2010
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 CLEANFILES = *.gcno *.gcda
 CLEANFILES += rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
@@ -16,7 +16,6 @@
 libdns_la_SOURCES += question.h question.cc
 libdns_la_SOURCES += message.h message.cc
 libdns_la_SOURCES += base64.h base64.cc
-libdns_la_SOURCES += exceptions.h exceptions.cc
 
 rrclass.h: rrclass-placeholder.h
 rrtype.h: rrtype-placeholder.h
@@ -29,7 +28,7 @@
 TESTS += run_unittests
 run_unittests_SOURCES = unittest_util.h unittest_util.cc
 run_unittests_SOURCES += buffer_unittest.cc name_unittest.cc
-run_unittests_SOURCES += messagerenderer_unittest.cc exceptions_unittest.cc
+run_unittests_SOURCES += messagerenderer_unittest.cc
 run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
 run_unittests_SOURCES += rrttl_unittest.cc
 run_unittests_SOURCES += rdata_unittest.cc
@@ -39,9 +38,10 @@
 run_unittests_SOURCES += message_unittest.cc
 run_unittests_SOURCES += base64_unittest.cc
 run_unittests_SOURCES += run_unittests.cc
-run_unittests_CPPFLAGS = $(GTEST_INCLUDES)
-run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = .libs/libdns.a $(GTEST_LDADD)
+run_unittests_LDADD +=  $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
 endif
 
 noinst_PROGRAMS = $(TESTS)

Modified: branches/parkinglot/src/lib/dns/cpp/base64.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/base64.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/base64.cc Fri Feb  5 11:09:38 2010
@@ -24,7 +24,7 @@
 #include <boost/archive/iterators/transform_width.hpp>
 
 #include "base64.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 using namespace std;
 using namespace boost::archive::iterators;

Modified: branches/parkinglot/src/lib/dns/cpp/base64.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/base64.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/base64.h Fri Feb  5 11:09:38 2010
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 //
 // Note: this helper module isn't specific to the DNS protocol per se.
@@ -38,7 +38,7 @@
 class BadBase64String : public Exception {
 public:
     BadBase64String(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 std::string encodeBase64(const std::vector<char>& binary);

Modified: branches/parkinglot/src/lib/dns/cpp/buffer.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/buffer.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/buffer.h Fri Feb  5 11:09:38 2010
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 namespace isc {
 namespace dns {
@@ -35,7 +35,7 @@
 class InvalidBufferPosition : public Exception {
 public:
     InvalidBufferPosition(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///\brief The \c InputBuffer class is a buffer abstraction for manipulating

Modified: branches/parkinglot/src/lib/dns/cpp/message.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/message.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/message.h Fri Feb  5 11:09:38 2010
@@ -22,7 +22,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "question.h"
 #include "rrset.h"
 
@@ -35,13 +35,13 @@
 class MessageTooShort : public Exception {
 public:
     MessageTooShort(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 class InvalidMessageSection : public Exception {
 public:
     InvalidMessageSection(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 typedef uint8_t rcode_t; // we actually only need 4 bits of it

Modified: branches/parkinglot/src/lib/dns/cpp/name.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/name.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/name.h Fri Feb  5 11:09:38 2010
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 namespace isc {
 namespace dns {
@@ -37,7 +37,7 @@
 class EmptyLabel : public Exception {
 public:
     EmptyLabel(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -47,7 +47,7 @@
 class TooLongName : public Exception {
 public:
     TooLongName(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -57,7 +57,7 @@
 class TooLongLabel : public Exception {
 public:
     TooLongLabel(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -69,7 +69,7 @@
 class BadLabelType : public Exception {
 public:
     BadLabelType(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -79,7 +79,7 @@
 class BadEscape : public Exception {
 public:
     BadEscape(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -89,7 +89,7 @@
 class BadPointer : public Exception {
 public:
     BadPointer(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -102,7 +102,7 @@
 class IncompleteName : public Exception {
 public:
     IncompleteName(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///

Modified: branches/parkinglot/src/lib/dns/cpp/rdata.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata.h Fri Feb  5 11:09:38 2010
@@ -41,7 +41,7 @@
 class InvalidRdataLength : public Exception {
 public:
     InvalidRdataLength(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -51,7 +51,7 @@
 class InvalidRdataText : public Exception {
 public:
     InvalidRdataText(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -60,7 +60,7 @@
 class CharStringTooLong : public Exception {
 public:
     CharStringTooLong(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 class Rdata;

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/ch_3/a_1.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/ch_3/a_1.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/ch_3/a_1.cc Fri Feb  5 11:09:38 2010
@@ -17,7 +17,7 @@
 #include <string>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rdata.h"
 #include "rdataclass.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/generic/mx_15.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/generic/mx_15.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/generic/mx_15.cc Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "name.h"
 #include "messagerenderer.h"
 #include "rdata.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/generic/soa_6.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/generic/soa_6.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/generic/soa_6.cc Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "name.h"
 #include "messagerenderer.h"
 #include "rdata.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/hs_4/a_1.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/hs_4/a_1.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/hs_4/a_1.cc Fri Feb  5 11:09:38 2010
@@ -17,7 +17,7 @@
 #include <string>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rdata.h"
 #include "rdataclass.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/in_1/a_1.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/in_1/a_1.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/in_1/a_1.cc Fri Feb  5 11:09:38 2010
@@ -22,7 +22,7 @@
 #include <arpa/inet.h> // XXX: for inet_pton/ntop(), not exist in C++ standards
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rdata.h"
 #include "rdataclass.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rdata/in_1/aaaa_28.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rdata/in_1/aaaa_28.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rdata/in_1/aaaa_28.cc Fri Feb  5 11:09:38 2010
@@ -22,7 +22,7 @@
 #include <arpa/inet.h> // XXX: for inet_pton/ntop(), not exist in C++ standards
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rdata.h"
 #include "rdataclass.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rrclass-placeholder.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrclass-placeholder.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrclass-placeholder.h Fri Feb  5 11:09:38 2010
@@ -17,7 +17,7 @@
 #ifndef __RRCLASS_H
 #define __RRCLASS_H 1
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 namespace isc {
 namespace dns {
@@ -34,7 +34,7 @@
 class InvalidRRClass : public Exception {
 public:
     InvalidRRClass(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -44,7 +44,7 @@
 class IncompleteRRClass : public Exception {
 public:
     IncompleteRRClass(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///

Modified: branches/parkinglot/src/lib/dns/cpp/rrclass.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrclass.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrclass.cc Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 #include <stdint.h>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rrparamregistry.h"
 #include "rrclass.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rrparamregistry-placeholder.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrparamregistry-placeholder.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrparamregistry-placeholder.cc Fri Feb  5 11:09:38 2010
@@ -27,7 +27,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "rrparamregistry.h"
 #include "rrclass.h"
 #include "rrtype.h"

Modified: branches/parkinglot/src/lib/dns/cpp/rrparamregistry.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrparamregistry.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrparamregistry.h Fri Feb  5 11:09:38 2010
@@ -23,7 +23,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "rdata.h"
 
 namespace isc {
@@ -39,7 +39,7 @@
 class RRTypeExists : public Exception {
 public:
     RRTypeExists(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -49,13 +49,13 @@
 class RRClassExists : public Exception {
 public:
     RRClassExists(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 class InvalidRdataText : public Exception {
 public:
     InvalidRdataText(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 namespace rdata {

Modified: branches/parkinglot/src/lib/dns/cpp/rrttl.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrttl.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrttl.h Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 namespace isc {
 namespace dns {
@@ -36,7 +36,7 @@
 class InvalidRRTTL : public Exception {
 public:
     InvalidRRTTL(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -46,7 +46,7 @@
 class IncompleteRRTTL : public Exception {
 public:
     IncompleteRRTTL(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///

Modified: branches/parkinglot/src/lib/dns/cpp/rrtype-placeholder.h
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrtype-placeholder.h (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrtype-placeholder.h Fri Feb  5 11:09:38 2010
@@ -17,7 +17,7 @@
 #ifndef __RRTYPE_H
 #define __RRTYPE_H 1
 
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 
 namespace isc {
 namespace dns {
@@ -34,7 +34,7 @@
 class InvalidRRType : public Exception {
 public:
     InvalidRRType(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///
@@ -44,7 +44,7 @@
 class IncompleteRRType : public Exception {
 public:
     IncompleteRRType(const char* file, size_t line, const char* what) :
-        isc::dns::Exception(file, line, what) {}
+        isc::Exception(file, line, what) {}
 };
 
 ///

Modified: branches/parkinglot/src/lib/dns/cpp/rrtype.cc
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/rrtype.cc (original)
+++ branches/parkinglot/src/lib/dns/cpp/rrtype.cc Fri Feb  5 11:09:38 2010
@@ -19,7 +19,7 @@
 #include <stdint.h>
 
 #include "buffer.h"
-#include "exceptions.h"
+#include <exceptions/exceptions.h>
 #include "messagerenderer.h"
 #include "rrparamregistry.h"
 #include "rrtype.h"




More information about the bind10-changes mailing list