mirror of
https://github.com/Zygo/bees.git
synced 2025-05-17 21:35:45 +02:00
build: fix FTBFS on GCC 6.2
I'm not surprised that GCC 6 doesn't let me send an ostream ref to itself, even inside an uninstantiated template specialization. I am a little surprised I was trying to, and 4.9 let me get away with it. It's 2016. auto_ptr is deprecated now. Some things were including vector that don't any more. https://github.com/Zygo/bees/issues/1
This commit is contained in:
parent
876b76d761
commit
1303fb9da8
@ -8,6 +8,7 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace crucible {
|
namespace crucible {
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
@ -86,16 +86,6 @@ namespace crucible {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template <>
|
|
||||||
struct ChatterTraits<ostream &> {
|
|
||||||
Chatter &
|
|
||||||
operator()(Chatter &c, ostream & arg)
|
|
||||||
{
|
|
||||||
c.get_os() << arg;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class ChatterBox {
|
class ChatterBox {
|
||||||
string m_file;
|
string m_file;
|
||||||
int m_line;
|
int m_line;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
namespace crucible {
|
namespace crucible {
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
static auto_ptr<set<string>> chatter_names;
|
static shared_ptr<set<string>> chatter_names;
|
||||||
static const char *SPACETAB = " \t";
|
static const char *SPACETAB = " \t";
|
||||||
|
|
||||||
static
|
static
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
using namespace crucible;
|
using namespace crucible;
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user