Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Commit

Permalink
Fix compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
sfraczek committed Jan 24, 2020
1 parent 75c4ba5 commit 35f9cb6
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 11 deletions.
10 changes: 10 additions & 0 deletions src/cpio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ using namespace nervana;

namespace nervana
{
namespace cpio
{
static const uint32_t FORMAT_VERSION = 1;
static const uint32_t WRITER_VERSION = 1;
static const char MAGIC_STRING[] = "MACR";
static const char CPIO_TRAILER[] = "TRAILER!!!";
static const char AEON_HEADER[] = "cpiohdr";
static const char AEON_TRAILER[] = "cpiotlr";
}

template <typename T>
void read_single_value(istream& ifs, T* data)
{
Expand Down
7 changes: 0 additions & 7 deletions src/cpio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ namespace nervana
{
namespace cpio
{
static const uint32_t FORMAT_VERSION = 1;
static const uint32_t WRITER_VERSION = 1;
static const char* MAGIC_STRING = "MACR";
static const char* CPIO_TRAILER = "TRAILER!!!";
static const char* AEON_HEADER = "cpiohdr";
static const char* AEON_TRAILER = "cpiotlr";

class record_header;
class file_header;
class file_trailer;
Expand Down
2 changes: 1 addition & 1 deletion src/etl_localization_rcnn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ shared_ptr<localization::rcnn::decoded>
}

cv::Size im_size{mp->width(), mp->height()};
auto crop = settings->cropbox;
//auto crop = settings->cropbox;

im_size = cv::Size{int(unbiased_round(input_size.width * im_scale)),
int(unbiased_round(input_size.height * im_scale))};
Expand Down
2 changes: 2 additions & 0 deletions src/interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ using namespace nervana;
using namespace std;
using namespace nlohmann;

int IGNORE_VALUE;

void json_configurable::verify_config(
const std::string& location,
const vector<shared_ptr<interface::config_info_interface>>& config,
Expand Down
2 changes: 1 addition & 1 deletion src/interface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "json.hpp"
#include "log.hpp"

static int IGNORE_VALUE;
extern int IGNORE_VALUE;

namespace nervana
{
Expand Down
2 changes: 1 addition & 1 deletion src/log.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace nervana
level_undefined,
};

static const char* log_level_env_var = "AEON_LOG_LEVEL";
static const char log_level_env_var[] = "AEON_LOG_LEVEL";
static const nervana::log_level default_log_level = nervana::log_level::level_warning;

class conststring
Expand Down
2 changes: 1 addition & 1 deletion src/provider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class nervana::provider::interface : public nervana::provider_interface
private:
void provide(int idx,
nervana::encoded_record& in_buf,
nervana::fixed_buffer_map& out_buf) const
nervana::fixed_buffer_map& out_buf) const override
{
}
};
Expand Down
3 changes: 3 additions & 0 deletions test/test_manifest_tsv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ void test_multinode_manifest(bool shuffle)
auto block = manifest.next();
auto block_node1 = manifest_node1.next();
auto block_node2 = manifest_node2.next();
(void) block;
(void) block_node1;
(void) block_node2;

manifest.reset();
manifest_node1.reset();
Expand Down

0 comments on commit 35f9cb6

Please sign in to comment.