Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
7afc9b1d
Commit
7afc9b1d
authored
12 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
for mscv
parent
b4de0b37
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
Common/StringUtils.cpp
+3
-3
3 additions, 3 deletions
Common/StringUtils.cpp
Common/VertexArray.h
+3
-3
3 additions, 3 deletions
Common/VertexArray.h
Geo/MVertexBoundaryLayerData.cpp
+2
-2
2 additions, 2 deletions
Geo/MVertexBoundaryLayerData.cpp
with
11 additions
and
11 deletions
CMakeLists.txt
+
3
−
3
View file @
7afc9b1d
...
...
@@ -160,7 +160,7 @@ include(CheckCXXCompilerFlag)
if
(
MSVC
)
# remove annoying warning about bool/int cast performance
set
(
GMSH_CONFIG_PRAGMAS
"#pragma warning(disable:4800)"
)
set
(
GMSH_CONFIG_PRAGMAS
"#pragma warning(disable:4800
4244 4267
)"
)
if
(
ENABLE_MSVC_STATIC_RUNTIME
)
foreach
(
VAR
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
...
...
@@ -975,12 +975,12 @@ endif(NOOPT)
# force full warnings to encourage everybody to write clean(er) code
check_cxx_compiler_flag
(
"-Wall"
WALL
)
if
(
WALL
)
if
(
WALL
AND NOT MSVC
)
file
(
GLOB_RECURSE WALL_SRC Common/*.cpp Fltk/*.cpp FunctionSpace/*.cpp
Geo/*.cpp Graphics/*.cpp Mesh/*.cpp Numeric/*.cpp Parser/*.cpp
Plugin/*.cpp Post/*.cpp Qt/*.cpp Solver/*.cpp contrib/onelab/*.cpp
)
set_source_files_properties
(
${
WALL_SRC
}
COMPILE_FLAGS
"-Wall"
)
endif
(
WALL
)
endif
(
WALL
AND NOT MSVC
)
list
(
SORT CONFIG_OPTIONS
)
set
(
GMSH_CONFIG_OPTIONS
""
)
...
...
This diff is collapsed.
Click to expand it.
Common/StringUtils.cpp
+
3
−
3
View file @
7afc9b1d
...
...
@@ -91,8 +91,8 @@ std::string FixRelativePath(const std::string &reference, const std::string &in)
std
::
vector
<
std
::
string
>
SplitFileName
(
const
std
::
string
&
fileName
)
{
// returns [path, baseName, extension]
int
idot
=
fileName
.
find_last_of
(
'.'
);
int
islash
=
fileName
.
find_last_of
(
"/
\\
"
);
int
idot
=
(
int
)
fileName
.
find_last_of
(
'.'
);
int
islash
=
(
int
)
fileName
.
find_last_of
(
"/
\\
"
);
if
(
idot
==
(
int
)
std
::
string
::
npos
)
idot
=
-
1
;
if
(
islash
==
(
int
)
std
::
string
::
npos
)
islash
=
-
1
;
std
::
vector
<
std
::
string
>
s
(
3
);
...
...
@@ -125,7 +125,7 @@ void ReplaceSubStringInPlace(const std::string &olds, const std::string &news,
std
::
string
&
str
)
{
while
(
1
){
int
pos
=
str
.
find
(
olds
.
c_str
());
int
pos
=
(
int
)
str
.
find
(
olds
.
c_str
());
if
(
pos
==
(
int
)
std
::
string
::
npos
)
break
;
str
.
replace
(
pos
,
olds
.
size
(),
news
.
c_str
());
}
...
...
This diff is collapsed.
Click to expand it.
Common/VertexArray.h
+
3
−
3
View file @
7afc9b1d
...
...
@@ -118,7 +118,7 @@ class BarycenterHash {
public:
std
::
size_t
operator
()(
const
Barycenter
&
b
)
const
{
return
b
.
x
()
+
b
.
y
()
+
b
.
z
();
return
(
std
::
size_t
)(
b
.
x
()
+
b
.
y
()
+
b
.
z
()
)
;
}
};
...
...
@@ -155,11 +155,11 @@ class VertexArray{
VertexArray
(
int
numVerticesPerElement
,
int
numElements
);
~
VertexArray
(){}
// return the number of vertices in the array
int
getNumVertices
()
{
return
_vertices
.
size
()
/
3
;
}
int
getNumVertices
()
{
return
(
int
)
_vertices
.
size
()
/
3
;
}
// return the number of vertices per element
int
getNumVerticesPerElement
()
{
return
_numVerticesPerElement
;
}
// return the number of element pointers
int
getNumElementPointers
()
{
return
_elements
.
size
();
}
int
getNumElementPointers
()
{
return
(
int
)
_elements
.
size
();
}
// return a pointer to the raw vertex array (warning: 1) we don't
// range check 2) calling this if _vertices.size() == 0 will cause
// some compilers to throw an exception)
...
...
This diff is collapsed.
Click to expand it.
Geo/MVertexBoundaryLayerData.cpp
+
2
−
2
View file @
7afc9b1d
...
...
@@ -18,7 +18,7 @@ std::vector<MVertex*>* MVertexBoundaryLayerData::getChildren(int i)
int
MVertexBoundaryLayerData
::
getNumChildren
(
int
i
)
{
if
(
i
<
(
int
)
this
->
children
.
size
()
&&
i
>=
0
)
{
return
this
->
children
[
i
].
size
();
return
(
int
)
this
->
children
[
i
].
size
();
}
else
{
return
-
1
;
...
...
@@ -27,7 +27,7 @@ int MVertexBoundaryLayerData::getNumChildren(int i)
int
MVertexBoundaryLayerData
::
getNumChildrenFamilies
()
{
return
this
->
children
.
size
();
return
(
int
)
this
->
children
.
size
();
}
void
MVertexBoundaryLayerData
::
addChildrenFamily
(
std
::
vector
<
MVertex
*>
family
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment