Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
e1ecff59
Commit
e1ecff59
authored
May 30, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
4c22b514
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
CMakeLists.txt
CMakeLists.txt
+3
-1
apps_cmake.txt
apps_cmake.txt
+2
-0
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+10
-10
No files found.
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
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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