updated to use new modules (more independance to libi2ncommon)

diff --git a/asyncio/async_callout.cpp b/asyncio/async_callout.cpp
index 976d3ed..866d198 100644 (file)
--- a/asyncio/async_callout.cpp
+++ b/asyncio/async_callout.cpp
@@ -8,9 +8,14 @@
  */
 
 #include "async_callout.hpp"
+#include <asyncio_config.hpp>
 
+#ifdef HAVE_LIBI2NCOMMON
 #include <tracefunc.hpp>
 #include <logfunc.hpp>
+#else
+#define SCOPETRACKER(x) do{}while(false)
+#endif
 
 #include <map>
 

diff --git a/asyncio/async_io.hpp b/asyncio/async_io.hpp
index 0ee1e40..cdb5224 100644 (file)
--- a/asyncio/async_io.hpp
+++ b/asyncio/async_io.hpp
@@ -18,9 +18,9 @@
 #include <list>
 #include <set>
 
-#include <asyncio_utils.hpp>
+#include <asyncio_config.hpp>
 
-#include <pointer_func.hpp>
+#include <asyncio_utils.hpp>
 
 #include <boost/signal.hpp>
 #include <boost/shared_ptr.hpp>
@@ -29,7 +29,9 @@
 namespace AsyncIo
 {
 
+#ifdef HAVE_LIBI2NCOMMON
 using namespace I2n;
+#endif
 using Utils::MilliTime;
 
 /*
@@ -115,7 +117,7 @@ class TimerBase
  * @note filter object can be used only by one io object.
  */
 class FilterBase
-: virtual public SharedBase
+: virtual public Utils::SharedBase
 {
         friend class IOImplementation;
     public:
@@ -187,7 +189,7 @@ class FilterNull : public FilterBase
  */
 class IOImplementation
 : public boost::signals::trackable
-, virtual public SharedBase
+, virtual public Utils::SharedBase
 {
         friend class Backend;
         friend class FilterBase;

diff --git a/asyncio/async_socket.cpp b/asyncio/async_socket.cpp
index 34e04ef..0314fff 100644 (file)
--- a/asyncio/async_socket.cpp
+++ b/asyncio/async_socket.cpp
@@ -15,7 +15,7 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <limits.h>
-#include <filefunc.hxx>
+#include <asyncio_system_tools.cpp>
 
 
 namespace AsyncIo
@@ -302,7 +302,7 @@ bool UnixServerSocketBase::open(const std::string& path, int mode)
       MegaAddr addr;
       addr.m_addr_un.sun_family= AF_UNIX;
       strncpy(addr.m_addr_un.sun_path, path.c_str(), PATH_MAX);
-      ::I2n::unlink(path); // just in case...
+      Utils::unlink(path); // just in case...
       mode_t old_mask= ::umask( (mode & 0777) ^ 0777);
       if (::bind(fd,(sockaddr*)&addr.m_addr_un, SUN_LEN(&addr.m_addr_un)) < 0)
       {

diff --git a/utils/asyncio_time_tools.hpp b/utils/asyncio_time_tools.hpp
index 38cab2b..42b12ed 100644 (file)
--- a/utils/asyncio_time_tools.hpp
+++ b/utils/asyncio_time_tools.hpp
@@ -80,4 +80,4 @@ void get_current_monotonic_time(MilliTime& mt);
 
 
 
-#endif
\ No newline at end of file
+#endif