Merge pull request #1 from sakhnik/master

Built on RHEL5.3

configure.in

@@ -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"`

ext/gsmsiectl.cc

@@ -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>

gsmlib/gsm_event.h

@@ -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};
 

gsmlib/gsm_sorted_phonebook_base.h

@@ -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)

gsmlib/gsm_util.h

@@ -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;
   };

gsmlib/gsm_win32_serial.cc

@@ -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>

tests/testssms.cc

@@ -3,7 +3,7 @@
 #include <gsmlib/gsm_phonebook.h>
 #include <algorithm>
 #include <iostream>
-#include <strstream>
+#include <sstream>
 
 using namespace std;
 using namespace gsmlib;