1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
|
Description: Fix FTBFS against Octave 4.0
Origin: upstream, https://savannah.gnu.org/bugs/download.php?file_id=34167
Bug: https://savannah.gnu.org/bugs/?func=detailitem&item_id=45258
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792877
Reviewed-by: Sébastien Villemot <sebastien@debian.org>
Last-Update: 2015-07-31
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/src/simple.h b/src/simple.h
--- a/src/simple.h
+++ b/src/simple.h
@@ -39,12 +39,12 @@
const std::string name;
MPI_Comm Comm_Value;
- DECLARE_OCTAVE_ALLOCATOR;
+ //DECLARE_OCTAVE_ALLOCATOR;
DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
};
-DEFINE_OCTAVE_ALLOCATOR (simple);
+//DEFINE_OCTAVE_ALLOCATOR (simple);
DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (simple, "simple", "simple");
static bool simple_type_loaded = false;
diff --git a/src/simpleop.h b/src/simpleop.h
--- a/src/simpleop.h
+++ b/src/simpleop.h
@@ -56,11 +56,11 @@
private:
const std::string name;
MPI_Op Op_Value;
- DECLARE_OCTAVE_ALLOCATOR
+ //DECLARE_OCTAVE_ALLOCATOR
DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
};
-DEFINE_OCTAVE_ALLOCATOR (simpleop);
+//DEFINE_OCTAVE_ALLOCATOR (simpleop);
DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (simpleop, "simpleop", "simpleop");
static bool simpleop_type_loaded = false;
|