# HG changeset patch
# User abarth93
# Date 1425995613 0
# Node ID f22c1e4bc9c5524afc70941c5f5354b8f04287bc
# Parent  c73c23bbe9cea4a5d6a0910cb0c10986a91a245a
Fix for compiling with octave 4.0.0-rc1

diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/DESCRIPTION
--- a/main/octcdf/DESCRIPTION	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/DESCRIPTION	Tue Mar 10 13:53:33 2015 +0000
@@ -1,6 +1,6 @@
 Name: octcdf
-Version: 1.1.7
-Date: 2014-02-17
+Version: 1.1.8
+Date: 2015-03-10
 Author: Alexander Barth <barth.alexander@gmail.com>
 Maintainer: Alexander Barth <barth.alexander@gmail.com>
 Title: octcdf
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/NEWS
--- a/main/octcdf/NEWS	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/NEWS	Tue Mar 10 13:53:33 2015 +0000
@@ -1,11 +1,12 @@
 Summary of important user-visible changes for releases of the octcdf package
 
 ===============================================================================
-octcdf-1.1.8   Release Date: 2014-xx-xx   Release Manager: Alexander Barth
+octcdf-1.1.8   Release Date: 2015-03-10   Release Manager: Alexander Barth
 ===============================================================================
 
  ** Add depreciation info. Please use the netcdf package instead (possibly in
     combination with ncarray).
+ ** Fix for compiling with octave 4.0.0-rc1
 
 ===============================================================================
 octcdf-1.1.7   Release Date: 2014-02-17   Release Manager: Alexander Barth
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncatt.cc
--- a/main/octcdf/src/ov-ncatt.cc	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncatt.cc	Tue Mar 10 13:53:33 2015 +0000
@@ -249,8 +249,9 @@
   set_name(new_name);
 }
 
-
+#ifdef DEFINE_OCTAVE_ALLOCATOR
 DEFINE_OCTAVE_ALLOCATOR(octave_ncatt);
+#endif
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncatt, "ncatt", "ncatt");
 
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncatt.h
--- a/main/octcdf/src/ov-ncatt.h	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncatt.h	Tue Mar 10 13:53:33 2015 +0000
@@ -143,8 +143,9 @@
 private:
   ncatt_t* nca;
 
-
+#ifdef DEFINE_OCTAVE_ALLOCATOR
   DECLARE_OCTAVE_ALLOCATOR 
+#endif
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncdim.cc
--- a/main/octcdf/src/ov-ncdim.cc	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncdim.cc	Tue Mar 10 13:53:33 2015 +0000
@@ -134,8 +134,9 @@
   set_name(new_name);
 }
 
-
+#ifdef DEFINE_OCTAVE_ALLOCATOR
 DEFINE_OCTAVE_ALLOCATOR(octave_ncdim);
+#endif
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncdim, "ncdim", "ncdim");
 
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncdim.h
--- a/main/octcdf/src/ov-ncdim.h	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncdim.h	Tue Mar 10 13:53:33 2015 +0000
@@ -134,8 +134,9 @@
 private:
   ncdim_t* ncd;
 
-
+#ifdef DEFINE_OCTAVE_ALLOCATOR
   DECLARE_OCTAVE_ALLOCATOR 
+#endif
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncfile.cc
--- a/main/octcdf/src/ov-ncfile.cc	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncfile.cc	Tue Mar 10 13:53:33 2015 +0000
@@ -478,8 +478,10 @@
 
 
 
+#ifdef DEFINE_OCTAVE_ALLOCATOR
+DEFINE_OCTAVE_ALLOCATOR(octave_ncfile)
+#endif
 
-DEFINE_OCTAVE_ALLOCATOR(octave_ncfile);
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncfile, "ncfile", "ncfile");
 
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncfile.h
--- a/main/octcdf/src/ov-ncfile.h	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncfile.h	Tue Mar 10 13:53:33 2015 +0000
@@ -105,8 +105,9 @@
 private:
   ncfile_t* nf;
 
-
+#ifdef DEFINE_OCTAVE_ALLOCATOR
   DECLARE_OCTAVE_ALLOCATOR 
+#endif
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };
 
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncvar.cc
--- a/main/octcdf/src/ov-ncvar.cc	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncvar.cc	Tue Mar 10 13:53:33 2015 +0000
@@ -530,7 +530,9 @@
   set_varname(new_name);
 }
 
+#ifdef DEFINE_OCTAVE_ALLOCATOR
 DEFINE_OCTAVE_ALLOCATOR(octave_ncvar);
+#endif
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_ncvar, "ncvar", "ncvar");
 
 // end octave_ncvar
diff -r c73c23bbe9ce -r f22c1e4bc9c5 main/octcdf/src/ov-ncvar.h
--- a/main/octcdf/src/ov-ncvar.h	Tue Feb 24 10:12:25 2015 +0000
+++ b/main/octcdf/src/ov-ncvar.h	Tue Mar 10 13:53:33 2015 +0000
@@ -162,7 +162,9 @@
 
 private:
 
+#ifdef DEFINE_OCTAVE_ALLOCATOR
   DECLARE_OCTAVE_ALLOCATOR 
+#endif
   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
 };