Multi-Hackers / SocketModem

A library for talking to Multi-Tech's Cellular SocketModem Devices.

Dependents:   M2X_dev axeda_wrapper_dev MTS_M2x_Example1 MTS_Cellular_Connect_Example ... more

Diff: io/IPStack.h

Revision:
43:3cacf019ed7d
Parent:
40:14342c4de476
Parent:
41:81d035fb0b6a
Child:
44:86fa8f50a1df
--- a/io/IPStack.h	Thu Dec 19 21:24:36 2013 +0000
+++ b/io/IPStack.h	Thu Dec 19 21:27:25 2013 +0000
@@ -84,6 +84,7 @@
     * -1 if there was an error in reading.
     */
     virtual int read(char* data, int max, int timeout = -1) = 0;
+<<<<<<< local
 
     /** This method is used to write data to a socket, assuming a valid socket
     * connection is already open.
@@ -97,6 +98,9 @@
     * -1 if there was an error in writing.
     */
     virtual int write(char* data, int length, int timeout = -1) = 0;
+=======
+    virtual int write(const char* data, int length, int timeout = -1) = 0;
+>>>>>>> other
 
     /** This method is used to get the number of bytes available to read off the
     * socket.