Merge branch 'master' into hssSection

zhuminjie · Sep 26, 2021 · e19aa70 · e19aa70
2 parents 872f2c4 + 0b679a2
commit e19aa70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/SRC/element/HUelements/MultipleNormalSpring.cpp b/SRC/element/HUelements/MultipleNormalSpring.cpp
@@ -59,14 +59,8 @@
 #include <elementAPI.h>
 
 //extern void printCommand(int argc, TCL_Char **argv);
-#ifdef _WIN32
 extern "C" double dbesi0(double);
 extern "C" double dbesi1(double);
-#else
-extern double dbesi0(double);
-extern double dbesi1(double);
-#endif
-
 
 
 static bool errDetected(bool ifNoError, const char *msg){

diff --git a/SRC/renderer/Renderer.h b/SRC/renderer/Renderer.h
@@ -68,9 +68,9 @@ class Renderer
     virtual int drawPoint(const Vector &, const Vector &rgb1, int tag = 0, int mode = 0, int width = 1) =0;
 
     virtual int drawLine(const Vector &, const Vector &, 
-        float V1, float V2, int tag = 0, int mode = 0) ;// =0;
+        float V1, float V2, int tag = 0, int mode = 0) =0;
     virtual int drawLine(const Vector &end1, const Vector &end2, 
-			 const Vector &rgb1, const Vector &rgb2,int tag = 0, int mode = 0) ;//=0;
+			 const Vector &rgb1, const Vector &rgb2,int tag = 0, int mode = 0) =0;
 
     virtual int drawCube(const Matrix &points, const Vector &values, int tag = 0, int mode = 0);
 
@@ -102,7 +102,7 @@ class Renderer
 
     virtual int setProjectionMode(const char *mode) =0; //parallel or perspective
     virtual int setFillMode(const char *mode) =0;    // wire or fill
-    virtual int setLineWidth(int width) ;// = 0;    // line width
+    virtual int setLineWidth(int width) =0;    // line width
 
     virtual int setPRP(float u, float v, float n) =0; // eye location if 
 	                       // perspective, dirn to +ViewPlane if parallel