Seperating cuda and c++ flags. Fixing some compile warnings.

This commit is contained in:
Mark Berrill
2015-03-12 20:52:10 -04:00
parent a60ee4ca99
commit 1b3152e690
5 changed files with 40 additions and 17 deletions

View File

@@ -135,10 +135,11 @@ void ParallelStreamBuffer::reserve( size_t size )
}
}
}
std::streamsize ParallelStreamBuffer::xsputn( const std::string &text, std::streamsize n )
std::streamsize ParallelStreamBuffer::xsputn( const char* text, std::streamsize n )
{
reserve(d_size+n);
memcpy(&d_buffer[d_size],text.c_str(),text.size());
memcpy(&d_buffer[d_size],text,n);
d_size += n;
if ( text[n-1]==0 || text[n-1]==10 ) { sync(); }
return n;
}