1
0
mirror of https://github.com/paboyle/Grid.git synced 2025-12-22 13:44:29 +00:00

Namespace, nvcc warning elimination.

This commit is contained in:
paboyle
2018-01-24 13:14:43 +00:00
parent 87ee592176
commit 22d137d4e5
8 changed files with 67 additions and 75 deletions

View File

@@ -28,16 +28,15 @@ Author: paboyle <paboyle@ph.ed.ac.uk>
/* END LEGAL */
#include <Grid/GridCore.h>
using namespace Grid;
using namespace std;
NAMESPACE_BEGIN(Grid);
// Writer implementation ///////////////////////////////////////////////////////
BinaryWriter::BinaryWriter(const string &fileName)
: file_(fileName, ios::binary|ios::out)
BinaryWriter::BinaryWriter(const std::string &fileName)
: file_(fileName, std::ios::binary|std::ios::out)
{}
template <>
void BinaryWriter::writeDefault(const string &s, const string &x)
void BinaryWriter::writeDefault(const std::string &s, const std::string &x)
{
uint64_t sz = x.size();
@@ -48,20 +47,20 @@ void BinaryWriter::writeDefault(const string &s, const string &x)
}
}
void BinaryWriter::writeDefault(const string &s, const char *x)
void BinaryWriter::writeDefault(const std::string &s, const char *x)
{
string sx(x);
std::string sx(x);
writeDefault(s, sx);
}
// Reader implementation ///////////////////////////////////////////////////////
BinaryReader::BinaryReader(const string &fileName)
: file_(fileName, ios::binary|ios::in)
BinaryReader::BinaryReader(const std::string &fileName)
: file_(fileName, std::ios::binary|std::ios::in)
{}
template <>
void BinaryReader::readDefault(const string &s, string &output)
void BinaryReader::readDefault(const std::string &s, std::string &output)
{
uint64_t sz;
@@ -69,3 +68,5 @@ void BinaryReader::readDefault(const string &s, string &output)
output.resize(sz);
file_.read((char *)output.data(), sz);
}
NAMESPACE_END(Grid);