Browse Source

Fixes for Mac! Compliles on OSX Clang++ now

submodule
tirons 8 years ago
parent
commit
d80831cb0a

+ 2
- 0
Modules/FDEM1D/include/KernelEM1DBase.h View File

@@ -83,6 +83,8 @@ namespace Lemma {
83 83
 
84 84
             virtual Complex GetKs()=0;
85 85
 
86
+            virtual std::string GetName() const = 0;
87
+
86 88
         protected:
87 89
 
88 90
             // ====================  DATA MEMBERS  =========================

+ 6
- 0
Modules/FDEM1D/include/KernelEM1DReflBase.h View File

@@ -142,6 +142,10 @@ namespace Lemma {
142 142
 
143 143
             // ====================  INQUIRY       =======================
144 144
 
145
+            virtual std::string GetName() const {
146
+                return CName;
147
+            }
148
+
145 149
         protected:
146 150
 
147 151
             // ====================  LIFECYCLE     =======================
@@ -237,6 +241,8 @@ namespace Lemma {
237 241
 
238 242
         private:
239 243
 
244
+            static constexpr auto CName = "KernelEM1DReflBase";
245
+
240 246
     }; // -----  end of class  KernelEM1DReflBase  -----
241 247
 
242 248
 }		// -----  end of Lemma  name  -----

+ 6
- 0
Modules/FDEM1D/include/KernelEM1DReflSpec.h View File

@@ -70,6 +70,10 @@ namespace Lemma {
70 70
 
71 71
             // ====================  INQUIRY       =======================
72 72
 
73
+            virtual std::string GetName() {
74
+                return CName;
75
+            } 
76
+
73 77
         protected:
74 78
         private:
75 79
 
@@ -102,6 +106,8 @@ namespace Lemma {
102 106
 
103 107
             // ====================  DATA MEMBERS  =========================
104 108
 
109
+            static constexpr auto CName = "KernelEM1DSpec";
110
+
105 111
     }; // -----  end of class  KernelEM1DReflSpec  -----
106 112
 
107 113
     //template<EMMODE Mode, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>

+ 6
- 3
Modules/FDEM1D/include/KernelEM1DSpec.h View File

@@ -132,9 +132,7 @@ namespace Lemma {
132 132
             }
133 133
 
134 134
             /** Returns the name of the underlying class, similiar to Python's type */
135
-            virtual inline std::string GetName() const {
136
-                return CName;
137
-            }
135
+            virtual std::string GetName() const; 
138 136
 
139 137
         protected:
140 138
 
@@ -216,6 +214,11 @@ namespace Lemma {
216 214
                -1.e0,  1.e0,
217 215
                 1.e0, -1.e0,
218 216
                -1.e0, -1.e0 ).finished();
217
+            
218
+    template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
219
+    std::string KernelEM1DSpec<Mode, Ikernel, Isource, Irecv>::GetName() const {
220
+        return CName;
221
+    }
219 222
 
220 223
     ///////////////////////////////////////////////
221 224
     // Declarations of specialisations for private fuctions

+ 1
- 1
Modules/LemmaCore/include/RectilinearGrid.h View File

@@ -180,7 +180,7 @@ namespace Lemma {
180 180
             // ====================  INQUIRY       =======================
181 181
 
182 182
             /** Returns the name of the underlying class, similiar to Python's type */
183
-            virtual inline std::string GetName() const;
183
+            virtual std::string GetName() const;
184 184
 
185 185
         protected:
186 186
 

+ 1
- 1
Modules/LemmaCore/include/RectilinearGridVTKExporter.h View File

@@ -101,7 +101,7 @@ class RectilinearGridVTKExporter : public LemmaObject {
101 101
     void WriteVTKGrid( const std::string& name );
102 102
 
103 103
     /** Returns the name of the underlying class, similiar to Python's type */
104
-    virtual inline std::string GetName() const;
104
+    virtual std::string GetName() const;
105 105
 
106 106
     protected:
107 107
 

+ 1
- 1
Modules/LemmaCore/include/WindowFilter.h View File

@@ -96,7 +96,7 @@ namespace Lemma {
96 96
             VectorXr GetFilterCoefficients( );
97 97
 
98 98
             /** Returns the name of the underlying class, similiar to Python's type */
99
-            virtual inline std::string GetName() const ;
99
+            virtual std::string GetName() const ;
100 100
 
101 101
         protected:
102 102
 

Loading…
Cancel
Save