diff options
| author | Tomek Mrugalski <tomasz@isc.org> | 2012-05-09 13:23:33 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomasz@isc.org> | 2012-05-09 13:23:33 +0200 |
| commit | a40b6c665617125eeb8716b12d92d806f0342396 (patch) | |
| tree | 7bd4d1a1b45c7fbb432aa54ed74cf3603297a433 /src/lib/dhcp/option4_addrlst.cc | |
| parent | [1540] Changes after review: (diff) | |
| parent | Default values are now in range of uintX_t (Compilation fix for Solaris). (diff) | |
| download | kea-a40b6c665617125eeb8716b12d92d806f0342396.tar.xz kea-a40b6c665617125eeb8716b12d92d806f0342396.zip | |
Merge branch 'master' into trac1540
Conflicts:
ChangeLog
src/bin/dhcp4/dhcp4_srv.h
src/lib/dhcp/libdhcp++.h
src/lib/dhcp/option.cc
src/lib/dhcp/option.h
src/lib/dhcp/option4_addrlst.cc
src/lib/dhcp/option6_ia.cc
src/lib/dhcp/option6_iaaddr.h
src/lib/dhcp/pkt4.h
src/lib/dhcp/pkt6.cc
src/lib/dhcp/pkt6.h
Diffstat (limited to 'src/lib/dhcp/option4_addrlst.cc')
| -rw-r--r-- | src/lib/dhcp/option4_addrlst.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/dhcp/option4_addrlst.cc b/src/lib/dhcp/option4_addrlst.cc index 7157e1defc..4b0224f017 100644 --- a/src/lib/dhcp/option4_addrlst.cc +++ b/src/lib/dhcp/option4_addrlst.cc @@ -23,10 +23,12 @@ #include <dhcp/option4_addrlst.h> using namespace std; -using namespace isc::dhcp; using namespace isc::util; using namespace isc::asiolink; +namespace isc { +namespace dhcp { + Option4AddrLst::Option4AddrLst(uint8_t type) :Option(V4, type) { } @@ -132,3 +134,6 @@ std::string Option4AddrLst::toText(int indent /* =0 */ ) { return tmp.str(); } + +} // end of isc::dhcp namespace +} // end of isc namespace |