Browse Source

[trac1446] renamed libdhcp.cc to libdhcp++.cc and libdhcp.h to libdhcp++.h

and renamed libdhcp_unittest to libdhcp++_unittest

(but didn't change LibDHCP within code)
Jeremy C. Reed 13 years ago
parent
commit
932e38a12c

+ 1 - 1
src/lib/dhcp/Makefile.am

@@ -9,7 +9,7 @@ CLEANFILES = *.gcno *.gcda
 
 
 lib_LTLIBRARIES = libdhcp++.la
 lib_LTLIBRARIES = libdhcp++.la
 libdhcp___la_SOURCES  =
 libdhcp___la_SOURCES  =
-libdhcp___la_SOURCES += libdhcp.cc libdhcp.h
+libdhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
 libdhcp___la_SOURCES += option.cc option.h
 libdhcp___la_SOURCES += option.cc option.h
 libdhcp___la_SOURCES += option6_ia.cc option6_ia.h
 libdhcp___la_SOURCES += option6_ia.cc option6_ia.h
 libdhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
 libdhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h

+ 1 - 1
src/lib/dhcp/libdhcp.cc

@@ -15,7 +15,7 @@
 #include <boost/shared_array.hpp>
 #include <boost/shared_array.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <util/buffer.h>
 #include <util/buffer.h>
-#include <dhcp/libdhcp.h>
+#include <dhcp/libdhcp++.h>
 #include "config.h"
 #include "config.h"
 #include <dhcp/dhcp6.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option.h>
 #include <dhcp/option.h>

src/lib/dhcp/libdhcp.h → src/lib/dhcp/libdhcp++.h


+ 1 - 1
src/lib/dhcp/option.cc

@@ -22,7 +22,7 @@
 #include "util/io_utilities.h"
 #include "util/io_utilities.h"
 
 
 #include "dhcp/option.h"
 #include "dhcp/option.h"
-#include "dhcp/libdhcp.h"
+#include "dhcp/libdhcp++.h"
 
 
 using namespace std;
 using namespace std;
 using namespace isc::dhcp;
 using namespace isc::dhcp;

+ 1 - 1
src/lib/dhcp/option6_addrlst.cc

@@ -19,7 +19,7 @@
 
 
 #include "asiolink/io_address.h"
 #include "asiolink/io_address.h"
 #include "util/io_utilities.h"
 #include "util/io_utilities.h"
-#include "dhcp/libdhcp.h"
+#include "dhcp/libdhcp++.h"
 #include "dhcp/option6_addrlst.h"
 #include "dhcp/option6_addrlst.h"
 #include "dhcp/dhcp6.h"
 #include "dhcp/dhcp6.h"
 
 

+ 1 - 1
src/lib/dhcp/option6_ia.cc

@@ -17,7 +17,7 @@
 #include <sstream>
 #include <sstream>
 #include "exceptions/exceptions.h"
 #include "exceptions/exceptions.h"
 
 
-#include "dhcp/libdhcp.h"
+#include "dhcp/libdhcp++.h"
 #include "dhcp/option6_ia.h"
 #include "dhcp/option6_ia.h"
 #include "dhcp/dhcp6.h"
 #include "dhcp/dhcp6.h"
 #include "util/io_utilities.h"
 #include "util/io_utilities.h"

+ 1 - 1
src/lib/dhcp/option6_iaaddr.cc

@@ -17,7 +17,7 @@
 #include <sstream>
 #include <sstream>
 #include "exceptions/exceptions.h"
 #include "exceptions/exceptions.h"
 
 
-#include "dhcp/libdhcp.h"
+#include "dhcp/libdhcp++.h"
 #include "dhcp/option6_iaaddr.h"
 #include "dhcp/option6_iaaddr.h"
 #include "dhcp/dhcp6.h"
 #include "dhcp/dhcp6.h"
 #include "asiolink/io_address.h"
 #include "asiolink/io_address.h"

+ 1 - 1
src/lib/dhcp/pkt4.cc

@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 // PERFORMANCE OF THIS SOFTWARE.
 
 
 #include <dhcp/pkt4.h>
 #include <dhcp/pkt4.h>
-#include <dhcp/libdhcp.h>
+#include <dhcp/libdhcp++.h>
 #include <dhcp/dhcp4.h>
 #include <dhcp/dhcp4.h>
 #include <exceptions/exceptions.h>
 #include <exceptions/exceptions.h>
 #include <asiolink/io_address.h>
 #include <asiolink/io_address.h>

+ 1 - 1
src/lib/dhcp/pkt6.cc

@@ -15,7 +15,7 @@
 
 
 #include "dhcp/dhcp6.h"
 #include "dhcp/dhcp6.h"
 #include "dhcp/pkt6.h"
 #include "dhcp/pkt6.h"
-#include "dhcp/libdhcp.h"
+#include "dhcp/libdhcp++.h"
 #include "exceptions/exceptions.h"
 #include "exceptions/exceptions.h"
 #include <iostream>
 #include <iostream>
 #include <sstream>
 #include <sstream>

+ 2 - 1
src/lib/dhcp/tests/Makefile.am

@@ -14,7 +14,8 @@ TESTS =
 if HAVE_GTEST
 if HAVE_GTEST
 TESTS += libdhcp_unittests
 TESTS += libdhcp_unittests
 libdhcp_unittests_SOURCES  = run_unittests.cc
 libdhcp_unittests_SOURCES  = run_unittests.cc
-libdhcp_unittests_SOURCES += ../libdhcp.h ../libdhcp.cc libdhcp_unittest.cc
+libdhcp_unittests_SOURCES += ../libdhcp++.h ../libdhcp++.cc
+libdhcp_unittests_SOURCES += libdhcp++_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_iaaddr.h ../option6_iaaddr.cc option6_iaaddr_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_iaaddr.h ../option6_iaaddr.cc option6_iaaddr_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_ia.h ../option6_ia.cc option6_ia_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_ia.h ../option6_ia.cc option6_ia_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_addrlst.h ../option6_addrlst.cc option6_addrlst_unittest.cc
 libdhcp_unittests_SOURCES += ../option6_addrlst.h ../option6_addrlst.cc option6_addrlst_unittest.cc

+ 1 - 1
src/lib/dhcp/tests/libdhcp_unittest.cc

@@ -18,7 +18,7 @@
 #include <arpa/inet.h>
 #include <arpa/inet.h>
 #include <gtest/gtest.h>
 #include <gtest/gtest.h>
 #include <util/buffer.h>
 #include <util/buffer.h>
-#include <dhcp/libdhcp.h>
+#include <dhcp/libdhcp++.h>
 #include "config.h"
 #include "config.h"
 
 
 using namespace std;
 using namespace std;