Changeset 3233 for branches/0.11-stable

Timestamp:

May 23, 2014, 11:47:19 AM (9 years ago)

Author:

Peter

Message:

refs #797. Fix the bug in 0.11.x

Location:

branches/0.11-stable

Files:

• test/bam_pair_analyse.cc (modified) (3 diffs)
• yat/omic/algorithm.h (modified) (2 diffs)

branches/0.11-stable/test/bam_pair_analyse.cc

@@ -1 +1 @@
 // $Id$
 //
-// Copyright (C) 2012, 2013 Peter Johansson
+// Copyright (C) 2012, 2013, 2014 Peter Johansson
 //
 // This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 #include <config.h>
 
-#include "Suite.h"
-
-using namespace theplu::yat;
-
 #if HAVE_LIBBAM
 #include "yat/omic/algorithm.h"
@@ -27 +23 @@
 #include "yat/omic/BamReadIterator.h"
 #endif
+
+// include Suite.h late to see that algorithm.h is OK to include
+// first. See ticket #793.
+#include "Suite.h"
+using namespace theplu::yat;
 
 void test1(test::Suite& suite);

branches/0.11-stable/yat/omic/algorithm.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2012, 2013 Peter Johansson
+  Copyright (C) 2012, 2013, 2014 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -27 +27 @@
 
 #include <boost/concept/assert.hpp>
+#include <boost/iterator/iterator_concepts.hpp>
 
 #include <iterator>