[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "nat-support" created.

[Commits to the Asterisk SCF project code repositories]

branch "nat-support" has been created
        at  7b7c71eca81fad15a1511ead251a09b592f6f6b9 (commit)

- Log -----------------------------------------------------------------
commit 7b7c71eca81fad15a1511ead251a09b592f6f6b9
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Jun 27 12:54:21 2011 -0230

    Fix build issues with merge.

diff --git a/include/AsteriskSCF/Helpers/Network.h b/include/AsteriskSCF/Helpers/Network.h
index 2ff39f9..23a0f3c 100644
--- a/include/AsteriskSCF/Helpers/Network.h
+++ b/include/AsteriskSCF/Helpers/Network.h
@@ -34,7 +34,7 @@ namespace Helpers
 // NOTE: I discovered that boost asio covers this territory, only with greater detail. I decided to keep going as I was
 // planning something far more basic to use. It's implemented in terms of asio though.
 //
-class ASTERISK_SCF_ICEBOX_EXPORT Address
+class ASTSCF_DLL_EXPORT Address
 {
     //
     // We don't want a proper assignment operator, this is to behave more like
@@ -68,7 +68,7 @@ typedef std::vector<AddressPtr> AddressSeq;
 /** 
  *
  **/
-class ASTERISK_SCF_ICEBOX_EXPORT DNSQuery
+class ASTSCF_DLL_EXPORT DNSQuery
 {
 public:
     virtual ~DNSQuery();
diff --git a/include/AsteriskSCF/NAT/Candidates.h b/include/AsteriskSCF/NAT/Candidates.h
index 00f33d6..1aa024e 100644
--- a/include/AsteriskSCF/NAT/Candidates.h
+++ b/include/AsteriskSCF/NAT/Candidates.h
@@ -29,7 +29,7 @@ namespace NAT
  * toSDP() creates an SDP compliant attribute line for the provided candidate.
  *
  **/
-std::string ASTERISK_SCF_ICEBOX_EXPORT toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate);
+std::string ASTSCF_DLL_EXPORT toSDP(const AsteriskSCF::System::NAT::V1::CandidatePtr& candidate);
 
 } /* End of namespace NAT */
 } /* End of namespace AsteriskSCF */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4bdb66f..d0a9c90 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,10 @@ astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
 add_subdirectory(CollocatedIceStorm)
 add_subdirectory(WorkQueue)
 add_subdirectory(ThreadPool)
-add_subdirectory(Helpers))
+add_subdirectory(Helpers)
+add_subdirectory(NAT)
 astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time)
+astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time system)
 astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
 astscf_component_build_library(astscf-ice-util-cpp)
 target_link_libraries(astscf-ice-util-cpp logging-client)
diff --git a/src/NAT/Candidates.cpp b/src/NAT/Candidates.cpp
index 28cf170..b76de27 100644
--- a/src/NAT/Candidates.cpp
+++ b/src/NAT/Candidates.cpp
@@ -14,10 +14,10 @@
  * at the top of the source tree.
  */
 
+#include <boost/asio/ip/address.hpp>
 #include <AsteriskSCF/NAT/Candidates.h>
 #include <AsteriskSCF/Helpers/Network.h>
 #include <sstream>
-#include <boost/asio/ip/address.hpp>
 #include <boost/functional/hash.hpp>
 
 using namespace AsteriskSCF::System::NAT::V1;

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/ice-util-cpp.git