diff options
| author | Jeff Donahue <jeff.donahue@gmail.com> | 2014-02-25 17:47:01 -0800 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2014-02-26 15:42:39 -0800 |
| commit | 598edbf16919e2e126999a57e897aaba6ce8d971 (patch) | |
| tree | d2d0eefb014b35eba178d23cfe6d2645e122dd05 /src | |
| parent | c66937cafb140c07b214344707e909bb300d63f5 (diff) | |
| download | caffeonacl-598edbf16919e2e126999a57e897aaba6ce8d971.tar.gz caffeonacl-598edbf16919e2e126999a57e897aaba6ce8d971.tar.bz2 caffeonacl-598edbf16919e2e126999a57e897aaba6ce8d971.zip | |
fix compiler warning for test_hdf5data_layer
Diffstat (limited to 'src')
| -rw-r--r-- | src/caffe/test/test_hdf5data_layer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/caffe/test/test_hdf5data_layer.cpp b/src/caffe/test/test_hdf5data_layer.cpp index 9717ca8e..ee2b315a 100644 --- a/src/caffe/test/test_hdf5data_layer.cpp +++ b/src/caffe/test/test_hdf5data_layer.cpp @@ -34,16 +34,17 @@ class HDF5DataLayerTest : public ::testing::Test { // TODO: generate sample HDF5 file on the fly. // For now, use example HDF5 file. // TODO: how to best deal with the relativeness of the path? - filename = "src/caffe/test/test_data/sample_data.h5"; + filename = new string("src/caffe/test/test_data/sample_data.h5"); LOG(INFO) << "Using sample HDF5 data file " << filename; } virtual ~HDF5DataLayerTest() { delete blob_top_data_; delete blob_top_label_; + delete filename; } - char* filename; + string* filename; Blob<Dtype>* const blob_top_data_; Blob<Dtype>* const blob_top_label_; vector<Blob<Dtype>*> blob_bottom_vec_; @@ -60,7 +61,7 @@ TYPED_TEST(HDF5DataLayerTest, TestRead) { LayerParameter param; int batchsize = 5; param.set_batchsize(batchsize); - param.set_source(this->filename); + param.set_source(*(this->filename)); int num_rows = 10; int num_cols = 8; HDF5DataLayer<TypeParam> layer(param); |