WIP: Issue 104 keep sampled geo info

Originally slated for the 1606 code base (now master). Should be rebased prior to merging into current development line.

Marked this merge request as a Work In Progress

mentioned in issue #104 (closed)

compilation error

mergedSurf/mergedSurf.C: In constructor 'Foam::mergedSurf::mergedSurf(const Foam::meshedSurf&, Foam::scalar)':
mergedSurf/mergedSurf.C:47:5: error: type 'Foam::mergedSurf' is not a direct base of 'Foam::mergedSurf'

changing mergedSurf->meshedSurf on line 47 seem to work. But fails further

sampledSurface/writers/nastran/nastranSurfaceWriter.C: In member function 'Foam::Ostream& Foam::nastranSurfaceWriter::writeFooter(Foam::Ostream&, const Foam::meshedSurf&) const':
sampledSurface/writers/nastran/nastranSurfaceWriter.C:360:19: error: expected initializer before ':' token
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected primary-expression at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected ';' at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected primary-expression at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected ')' at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected statement at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: error: expected '}' at end of input
sampledSurface/writers/nastran/nastranSurfaceWriter.C:478:1: warning: no return statement in function returning non-void

This is due to having some C++11 syntax. I guess that I wasn't careful enough about older compiler versions.

• line 360 (nastran writer) uses a range-based for, which available starting with gcc 4.6
• line 47 (mergedSurf) uses a delegating constructor, which is available starting with gcc 4.7

I'll downgrade to older syntax and push now.

Added 1 commit:

• fa9c6af3 - COMPILE: avoid newer C++11 features that were used in solving issue #104 (closed)

Target branch changed from develop to merge-foundation

By Andrew Heather on 2016-10-04T09:33:00 (imported from GitLab project)

Target branch changed from merge-foundation to master

Mentioned in merge request !75 (merged)

Status changed to closed

Functionality already merged into develop.