Changeset 18

Timestamp:

10/15/08 23:15:14 (4 years ago)

Author:

jwind

Message:

Made files compile on gcc 4.3.2 (Ubuntu 8.10).
gcc 4.3 seems to be more picky than before.

Location:

trunk

Files:

• avango-core/include/avango/NetID.h (modified) (1 diff)
• avango-core/src/avango/streams/OutputStream.cpp (modified) (3 diffs)
• avango-core/src/avango/types/UUID.cpp (modified) (4 diffs)
• avango-daemon/src/avango/daemon/HIDInput.cpp (modified) (2 diffs)
• avango-daemon/src/avango/daemon/StationBlock.cpp (modified) (2 diffs)
• avango-daemon/src/avango/daemon/dtrack/dtrack.cpp (modified) (2 diffs)

trunk/avango-core/include/avango/NetID.h

@@ -27 +27 @@
 #define AVANGO_NETID_H
 
+#include <string>
 #include <iosfwd>
 #include <tr1/unordered_set>

trunk/avango-core/src/avango/streams/OutputStream.cpp

@@ -25 +25 @@
 
 #include <avango/OutputStream.h>
+#include <cstring>
+
 
 av::OutputStream::OutputStream() :
@@ -190 +192 @@
   if (os.isBinaryEnabled()) {
     if (value.c_str()) {
-      int length = strlen(value.c_str());
+      int length = std::strlen(value.c_str());
       os.write((char*) &length, sizeof(length));
       os.write(value.c_str(), length);
@@ -200 +202 @@
     (std::ostream&)os << '"';
     if (value.c_str())
-      os.write(value.c_str(), strlen(value.c_str()));
+      os.write(value.c_str(), std::strlen(value.c_str()));
     (std::ostream&)os << '"';
   }

trunk/avango-core/src/avango/types/UUID.cpp

@@ -139 +139 @@
 #include <avango/Config.h>
 
+#include <cstring>
+
 namespace
 {
@@ -261 +263 @@
   }
 
-  (void) memcpy (&mId, &new_uuid.bits, sizeof (mId));
+  (void) std::memcpy (&mId, &new_uuid.bits, sizeof (mId));
 
   if (!valid ())
@@ -285 +287 @@
   mId (av::UUID::nil.mId)
 {
-  (void) memcpy (&mId, &a.bits, sizeof (mId));
+  (void) std::memcpy (&mId, &a.bits, sizeof (mId));
 
   if (!valid ()) {
@@ -343 +345 @@
   UUID::RawType result;
 
-  (void) memcpy (&result.bits, &mId, sizeof (result.bits));
+  (void) std::memcpy (&result.bits, &mId, sizeof (result.bits));
 
   return result;

trunk/avango-daemon/src/avango/daemon/HIDInput.cpp

@@ -25 +25 @@
 
 #include <cerrno>
+#include <cstring>
 #include <fcntl.h>
 #include <sstream>
@@ -606 +607 @@
 
       for (ns = mStations.begin(); ns != mStations.end(); ++ns) {
-        if (0 == strcmp((*ns).second->getName(),station.c_str())) {
+        if (0 == std::strcmp((*ns).second->getName(),station.c_str())) {
           station_id = (*ns).first;
           break;

trunk/avango-daemon/src/avango/daemon/StationBlock.cpp

@@ -27 +27 @@
 
 #include <avango/Logger.h>
-
+#include <cstring>
 
 namespace
@@ -54 +54 @@
   for (i=0; i<mNumStations; i++)
   {
-    if (strcmp(name, mStations[i].getName()) == 0)
+    if (std::strcmp(name, mStations[i].getName()) == 0)
     {
       station = &mStations[i];

trunk/avango-daemon/src/avango/daemon/dtrack/dtrack.cpp

@@ -36 +36 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
+#include <cstring>
 
 #ifdef OS_UNIX
@@ -442 +442 @@
         // send udp packet:
 
-        if(udp_send(_udpsock, cmdstr, strlen(cmdstr) + 1, _remote_ip, _remote_port, _udptimeout_us)){
+        if(udp_send(_udpsock, cmdstr, std::strlen(cmdstr) + 1, _remote_ip, _remote_port, _udptimeout_us)){
                 return DTRACK_ERR_CMD;
         }