Permalink
Browse files

Merge pull request #1 from sakhnik/master

Built on RHEL5.3
  • Loading branch information...
2 parents 4cff2ac + b53d98b commit 5ba2e70d705d1db937f06c0d0f9262230d7edd3a @vbouchaud committed Oct 18, 2011
Showing with 12 additions and 4 deletions.
  1. +1 −1 configure.in
  2. +1 −1 ext/gsmsiectl.cc
  3. +2 −0 gsmlib/gsm_event.h
  4. +2 −0 gsmlib/gsm_sorted_phonebook_base.h
  5. +4 −0 gsmlib/gsm_util.h
  6. +1 −1 gsmlib/gsm_win32_serial.cc
  7. +1 −1 tests/testssms.cc
View
@@ -108,7 +108,7 @@ AC_SUBST(GSM_VERSION)
dnl national language support (NLS)
LINGUAS="de"
ALL_LINGUAS=$LINGUAS
-AM_GNU_GETTEXT
+AM_GLIB_GNU_GETTEXT
dnl set locale dir (FIXME there must be a better way)
_localedir=`eval "echo $datadir/locale"`
View
@@ -18,7 +18,7 @@
#if defined(HAVE_GETOPT_LONG) || defined(WIN32)
#include <getopt.h>
#endif
-#include <strstream>
+#include <sstream>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
View
@@ -31,6 +31,8 @@ namespace gsmlib
void dispatch(std::string s, GsmAt &at) throw(GsmException);
public:
+ virtual ~GsmEvent() { }
+
// for SMSReception, type of SMS
enum SMSMessageType {NormalSMS, CellBroadcastSMS, StatusReportSMS};
@@ -186,6 +186,8 @@ namespace gsmlib
class CustomPhonebookFactory
{
public:
+ virtual ~CustomPhonebookFactory() { }
+
// return sorted phonebook object given the source specification
// (eg. database name, URL, etc.)
virtual SortedPhonebookRef createPhonebook(std::string source)
View
@@ -186,6 +186,8 @@ namespace gsmlib
class InterruptBase
{
public:
+ virtual ~InterruptBase() { }
+
// this member should return true if gsmlib is to be interrupted
virtual bool interrupted() = 0;
};
@@ -201,6 +203,8 @@ namespace gsmlib
class ProgressBase
{
public:
+ virtual ~ProgressBase() { }
+
// override this to receive progress reports
virtual void reportProgress(int part, int total) = 0;
};
@@ -19,7 +19,7 @@
#include <gsmlib/gsm_util.h>
#include <fcntl.h>
#include <iostream>
-#include <strstream>
+#include <sstream>
#include <errno.h>
#include <stdio.h>
#include <assert.h>
View
@@ -3,7 +3,7 @@
#include <gsmlib/gsm_phonebook.h>
#include <algorithm>
#include <iostream>
-#include <strstream>
+#include <sstream>
using namespace std;
using namespace gsmlib;

0 comments on commit 5ba2e70

Please sign in to comment.