summaryrefslogtreecommitdiffabout
path: root/lib
authorDennis Menschel <demichan at mail dot upb dot de>2009-03-20 23:23:05 (UTC)
committer Michael Krelin <hacker@klever.net>2009-03-22 17:15:32 (UTC)
commit87cbeba4a750b1747dd32538c9c220145169cd2c (patch) (unidiff)
tree7953a6715c8ca0810cfaef4e1939fe2be534de3f /lib
parent0c21a7a0d5b84dc6726462f0fbe51b8c32433262 (diff)
downloadmidillo-master.zip
midillo-master.tar.gz
midillo-master.tar.bz2
Added missing includes for gcc 4.3HEADmaster
Added missing includes <cstring> and <cassert>, which are required/enforced by GCC 4.3. Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/SMF.cc1
-rw-r--r--lib/message.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/SMF.cc b/lib/SMF.cc
index ba3179d..2c62b1f 100644
--- a/lib/SMF.cc
+++ b/lib/SMF.cc
@@ -1,20 +1,21 @@
1#include <iostream> 1#include <iostream>
2#include <fstream> 2#include <fstream>
3#include <algorithm> 3#include <algorithm>
4#include <iterator> 4#include <iterator>
5#include <cstring>
5#include <midillo/SMF.h> 6#include <midillo/SMF.h>
6 7
7namespace midillo { 8namespace midillo {
8 using std::ifstream; 9 using std::ifstream;
9 using std::ofstream; 10 using std::ofstream;
10 using std::cin; 11 using std::cin;
11 using std::cout; 12 using std::cout;
12 using std::copy; 13 using std::copy;
13 using std::ostream_iterator; 14 using std::ostream_iterator;
14 using std::endl; 15 using std::endl;
15 16
16 void SMF_t::load(const char *f,bool stdinable) { 17 void SMF_t::load(const char *f,bool stdinable) {
17 if(stdinable && !strcmp(f,"-")) { 18 if(stdinable && !strcmp(f,"-")) {
18 load(cin); 19 load(cin);
19 }else{ 20 }else{
20 ifstream s(f,std::ios::in|std::ios::binary); 21 ifstream s(f,std::ios::in|std::ios::binary);
diff --git a/lib/message.cc b/lib/message.cc
index 8f9e68a..6a5cfd6 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1,18 +1,19 @@
1#include <algorithm> 1#include <algorithm>
2#include <iterator> 2#include <iterator>
3#include <cassert>
3#include <midillo/message.h> 4#include <midillo/message.h>
4#include <midillo/util.h> 5#include <midillo/util.h>
5#include <midillo/exception.h> 6#include <midillo/exception.h>
6 7
7namespace midillo { 8namespace midillo {
8 using std::copy; 9 using std::copy;
9 using std::ostream_iterator; 10 using std::ostream_iterator;
10 11
11 unsigned long message_t::calculate_save_size(int& rs) const { 12 unsigned long message_t::calculate_save_size(int& rs) const {
12 unsigned long rv = 0; 13 unsigned long rv = 0;
13 if(status!=rs) { 14 if(status!=rs) {
14 ++rv; 15 ++rv;
15 rs = status; 16 rs = status;
16 }else if((status&status_event_bits)==status_system) { 17 }else if((status&status_event_bits)==status_system) {
17 rs = -1; 18 rs = -1;
18 ++rv; // XXX: is it really needed? 19 ++rv; // XXX: is it really needed?