fixed mac compiler error

bbuchfink · Jun 21, 2016 · 810f3b4 · 810f3b4
1 parent a1a6883
commit 810f3b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/basic/match.h b/src/basic/match.h
@@ -136,6 +136,13 @@ struct hit
 
 #pragma pack()
 
+struct Hsp_data
+{
+	unsigned score, frame, length, identities, mismatches, positives, gap_openings, gaps;
+	interval query_source_range, query_range, subject_range;
+	Packed_transcript transcript;
+};
+
 struct local_match
 {
 	typedef vector<local_match>::iterator iterator;
@@ -226,11 +233,6 @@ struct local_match
 		std::cout << "Score = " << score_ << std::endl;
 		::print(std::cout, &query[query_begin_], &subject[subject_begin_], transcript_right_, transcript_left_, buf);
 	}
-	/*friend std::ostream& operator<<(std::ostream &os, const local_match &x)
-	{
-		os << "(sbj=" << x.subject_range() << " score=" << Scoring<_val>::bitscore(x.score_) << ")";
-		return os;
-	}*/
 	bool pass_through(const Diagonal_segment &d, const vector<char> &transcript_buf);
 	bool is_weakly_enveloped(const local_match &j);
 	unsigned len_, query_begin_, subject_len_, gap_openings_, identities_, mismatches_, total_subject_len_;

diff --git a/src/basic/packed_transcript.h b/src/basic/packed_transcript.h
@@ -1,6 +1,5 @@
 /****
-Copyright (c) 2015, University of Tuebingen
-Author: Benjamin Buchfink
+Copyright (c) 2015-2016, University of Tuebingen, Benjamin Buchfink
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/src/output/output_format.h b/src/output/output_format.h
@@ -206,6 +206,8 @@ struct Sam_format : public Output_format
 
 struct XML_format : public Output_format
 {
+	XML_format()
+	{}
 	virtual void print_match(const DAA_query_record::Match &r, Text_buffer &out) const;
 	virtual void print_header(Output_stream &f, int mode, const char *matrix, int gap_open, int gap_extend, double evalue) const;
 	virtual void print_query_intro(const DAA_query_record &r, Text_buffer &out) const;

diff --git a/src/util/compressed_stream.cpp b/src/util/compressed_stream.cpp
@@ -59,8 +59,7 @@ Compressed_ostream::Compressed_ostream(const string &file_name):
 	strm.zalloc = Z_NULL;
 	strm.zfree = Z_NULL;
 	strm.opaque = Z_NULL;
-	int ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY);
-	if (ret != Z_OK)
+	if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY) != Z_OK)
 		throw std::runtime_error("deflateInit error");
 }