+ fix clang warnings, fix wrong characters

FreeCAD · Oct 5, 2015 · 30b5311 · 30b5311
1 parent 0b47413
commit 30b5311
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx b/src/3rdParty/salomesmesh/inc/SMESH_subMeshEventListener.hxx
@@ -33,7 +33,7 @@
 
 class  SMESH_subMesh;
 class  SMESH_Hypothesis;
-struct  SMESH_subMeshEventListenerData;
+struct SMESH_subMeshEventListenerData;
 
 // ------------------------------------------------------------------
 /*!

diff --git a/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp b/src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
@@ -339,7 +339,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh&         aMesh,
   // --------------------
 
   double edgeLength = 0;
-  if (_hypLengthFromEdges || !_hypLengthFromEdges && !_hypMaxElementArea)
+  if (_hypLengthFromEdges || (!_hypLengthFromEdges && !_hypMaxElementArea))
   {
     int nbSegments = 0;
     for ( int iW = 0; iW < nbWires; ++iW )
@@ -368,7 +368,7 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh&         aMesh,
   // Generate surface mesh
   // -------------------------
 
-  char *optstr;
+  char *optstr = 0;
   int startWith = MESHCONST_MESHSURFACE;
   int endWith   = MESHCONST_OPTSURFACE;
   int err = 1;

diff --git a/src/Base/Sequencer.h b/src/Base/Sequencer.h
@@ -228,7 +228,7 @@ class BaseExport SequencerBase
     virtual void setProgress(size_t);
     /**
      * Resets internal data.
-     * If you want to reimplement this method, it is very important to call it ín
+     * If you want to reimplement this method, it is very important to call it in
      * the re-implemented method.
      */
     virtual void resetData();

diff --git a/src/Base/StackWalker.cpp b/src/Base/StackWalker.cpp
@@ -659,7 +659,7 @@ typedef struct IMAGEHLP_MODULE64_V2 {
     pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" );
     if ( (pEPM == NULL) || (pGMFNE == NULL) || (pGMBN == NULL) || (pGMI == NULL) )
     {
-      // we couldn´t find all functions
+      // we couldn't find all functions
       FreeLibrary(hPsapi);
       return FALSE;
     }