Skip to content

Commit

Permalink
Merge pull request #10 from wolfv/cling_fix_2
Browse files Browse the repository at this point in the history
release 0.2.2 with cling-related warning fix
  • Loading branch information
wolfv authored Nov 30, 2017
2 parents 1e8b50c + b70b0ce commit 4d0ace4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
7 changes: 7 additions & 0 deletions include/xtensor-io/ximage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@
#include "xtensor/xeval.hpp"

#include "xtensor_io_config.hpp"

#ifdef __CLING__
#pragma clang diagnostic push
// silencing warnings from OpenEXR 2.2.0 / OpenImageIO
#pragma clang diagnostic ignored "-Wdeprecated-register"
#pragma cling load("OpenImageIO")
#pragma clang diagnostic pop
#endif

namespace xt
{
Expand Down
2 changes: 1 addition & 1 deletion include/xtensor-io/xtensor_io_config.hpp.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#define XTENSOR_IO_VERSION_MAJOR 0
#define XTENSOR_IO_VERSION_MINOR 2
#define XTENSOR_IO_VERSION_PATCH 1
#define XTENSOR_IO_VERSION_PATCH 2

#pragma cling add_library_path(@XTENSOR_IO_CLING_LIBRARY_DIR_64@)
#pragma cling add_library_path(@XTENSOR_IO_CLING_LIBRARY_DIR_32@)
Expand Down

0 comments on commit 4d0ace4

Please # to comment.