Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
KennethVanhoey
CGoGN
Commits
e1ecff59
Commit
e1ecff59
authored
May 30, 2014
by
Sylvain Thery
Browse files
bugfix
parent
4c22b514
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
e1ecff59
...
...
@@ -150,7 +150,9 @@ IF(WIN32)
set
(
CMAKE_CONFIGURATION_TYPES
"
${
CMAKE_CONFIGURATION_TYPES
}
"
CACHE STRING
"Only Release or Debug"
FORCE
)
# set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE)
ELSE
(
WIN32
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -Wextra -fPIC -std=c++11"
)
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC -std=c++11 -pg")
# SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -Wextra -fPIC -std=c++11"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wall -Woverride-init -fPIC"
)
# remove the 60000+ "no unused local typedefs" warnings with GCC4.8+
if
(
CMAKE_COMPILER_IS_GNUCXX
)
...
...
apps_cmake.txt
View file @
e1ecff59
...
...
@@ -113,6 +113,8 @@ IF(WIN32)
set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
ELSE(WIN32)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC -std=c++11")
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -fPIC -std=c++11 -pg")
# SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
if(CMAKE_COMPILER_IS_GNUCXX)
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
...
...
src/Topology/generic/genericmap.cpp
View file @
e1ecff59
...
...
@@ -126,16 +126,16 @@ GenericMap::~GenericMap()
(
*
it
).
second
->
setInvalid
()
;
attributeHandlers
.
clear
()
;
for
(
unsigned
int
i
=
0
;
i
<
NB_THREAD
;
++
i
)
{
for
(
std
::
vector
<
DartMarkerGen
*>::
iterator
it
=
dartMarkers
[
i
].
begin
();
it
!=
dartMarkers
[
i
].
end
();
++
it
)
(
*
it
)
->
setReleaseOnDestruct
(
false
)
;
dartMarkers
[
i
].
clear
()
;
for
(
std
::
vector
<
CellMarkerGen
*>::
iterator
it
=
cellMarkers
[
i
].
begin
();
it
!=
cellMarkers
[
i
].
end
();
++
it
)
(
*
it
)
->
setReleaseOnDestruct
(
false
)
;
cellMarkers
[
i
].
clear
()
;
}
//
for (unsigned int i = 0; i < NB_THREAD; ++i)
//
{
//
for(std::vector<DartMarkerGen*>::iterator it = dartMarkers[i].begin(); it != dartMarkers[i].end(); ++it)
//
(*it)->setReleaseOnDestruct(false) ;
//
dartMarkers[i].clear() ;
//
for(std::vector<CellMarkerGen*>::iterator it = cellMarkers[i].begin(); it != cellMarkers[i].end(); ++it)
//
(*it)->setReleaseOnDestruct(false) ;
//
cellMarkers[i].clear() ;
//
}
// clean type registry if necessary
m_nbInstances
--
;
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment