summaryrefslogtreecommitdiff
blob: e017255b0bef04c39ef6bfcc0b773e3d70df4bb5 (plain)
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
diff -up gdl-0.9.6/src/specializations.hpp.gcc6 gdl-0.9.6/src/specializations.hpp
--- gdl-0.9.6/src/specializations.hpp.gcc6	2015-08-24 15:26:47.000000000 -0600
+++ gdl-0.9.6/src/specializations.hpp	2016-03-03 16:30:46.694379312 -0700
@@ -534,16 +534,6 @@ void Data_<SpDString>::MinMax( DLong* mi
 
 // default_io.cpp
 template<>  
-std::istream& operator>>(std::istream& i, Data_<SpDFloat>& data_); 
-template<>  
-std::istream& operator>>(std::istream& i, Data_<SpDDouble>& data_); 
-template<>  
-std::istream& operator>>(std::istream& i, Data_<SpDComplex>& data_); 
-template<>  
-std::istream& operator>>(std::istream& i, Data_<SpDComplexDbl>& data_); 
-template<>  
-std::istream& operator>>(std::istream& is, Data_<SpDString>& data_); 
-template<>  
 std::ostream& Data_<SpDLong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
 template<>  
 std::ostream& Data_<SpDULong>::ToStream(std::ostream& o, SizeT w, SizeT* actPosPtr); 
--- gdl-0.9.6/src/typedefs.hpp.gcc6	2014/08/09 15:33:29	1.76
+++ gdl-0.9.6/src/typedefs.hpp	2016/02/04 22:48:46	1.77
@@ -235,7 +235,7 @@
   
   Guard& operator=( Guard& r)
   {
-    if( &r == this) return;
+    if( &r == this) return *this;
     delete guarded;
     guarded = r.guarded;
     r.guarded = NULL;