[CIG-LONG] Fw: Mercurial compilation trouble

[Walter Landry]

Hi Patrice,

You modified AbstractContext.h and then updated from the repository.
Those changes conflicted, so mercurial preserved them for you to
choose which one you like.  If you look inside AbstractContext.h, you
will probably see something like

  <<<<<<< /tmp/AbstractContext.h
  		unsigned int			        maxTimeSteps; \
  =======
  		int			        maxTimeSteps; \
  >>>>>>> /tmp/AbstractContext.h-other

The simplest way to fix this is to revert back to the version in
mercurial.  Specifically, type

  cd StGermain
  hg revert StGermain/Base/Context/src/AbstractContext.h

Then it should build.

Cheers,
Walter Landry

Patrice Rey <patrice.rey at me.com> wrote:
> Hi Walter
> 
> I have removed the extra ">" at line 214 in the input file.
> 
> Then, I have downloaded again the Mercurial version.
> 
> I have run without problem the script ./configure.sh
> 
> and then ./scons which lead to the following:
> 
> cod:gale patricerey$ sudo ./scons scons: Reading SConscript files ...
> Copy("/Users/patricerey/Develop/Gale-Mercurial/gale/build/StGermain/stg_static_modules.cxx", "/Users/patricerey/Develop/Gale-Mercurial/gale/StGermain/libStGermain/src/stg_static_modules.cxx.tmpl")
> scons: done reading SConscript files.
> scons: Building targets ...
> g++ -o build/PICellerator/MaterialPoints/src/BackgroundParticleLayout.os -c -O3 -PIC -Wwrite-strings -Wno-strict-aliasing -O -Wall -fPIC -DCURR_MODULE_NAME="\"MaterialPoints\"" -DNDEBUG -DHAVE_LIBXML2 -DHAVE_MPI -DHAVE_HDF5 -DHAVE_PETSC -DSYSTEM_SIZEOF_LONG=8 -DMODULE_EXT="\"dylib\"" -DLIB_DIR="\"/Users/patricerey/Develop/Gale-Mercurial/gale/build/lib\"" -DNOSHARED -DVERSION="\"unknown\"" -DREAD_HDF5 -DWRITE_HDF5 -Ibuild/include/muParser -I/usr/include/libxml2 -I/usr/local/mpich2-optimised_2/include -I/usr/local/hdf5/include -I/usr/local/petsc3-optimised/include -Ibuild/include -Ibuild/include/PICellerator PICellerator/MaterialPoints/src/BackgroundParticleLayout.cxx
> In file included from build/include/StGermain/Base/Context/Context.h:61,
>                  from build/include/StGermain/Base/Base.h:50,
>                  from build/include/StGermain/StGermain.h:48,
>                  from PICellerator/MaterialPoints/src/BackgroundParticleLayout.cxx:35:
> build/include/StGermain/Base/Context/AbstractContext.h:111: error: expected unqualified-id before '==' token
> build/include/StGermain/Base/Context/AbstractContext.h:113: error: expected unqualified-id before '>>' token
> build/include/StGermain/Base/Context/AbstractContext.h:175: error: expected unqualified-id before '<<' token
> In file included from build/include/StgDomain/Utils/Utils.h:61,
>                  from build/include/StgDomain/StgDomain.h:48,
>                  from PICellerator/MaterialPoints/src/BackgroundParticleLayout.cxx:36:
> build/include/StgDomain/Utils/DomainContext.h:55: error: expected unqualified-id before '<<' token
> In file included from build/include/StgFEM/SLE/SystemSetup/SystemSetup.h:77,
>                  from build/include/StgFEM/SLE/SLE.h:56,
>                  from build/include/StgFEM/StgFEM.h:57,
>                  from PICellerator/MaterialPoints/src/BackgroundParticleLayout.cxx:37:
> build/include/StgFEM/SLE/SystemSetup/FiniteElementContext.h:76: error: expected unqualified-id before '<<' token
> scons: *** [build/PICellerator/MaterialPoints/src/BackgroundParticleLayout.os] Error 1
> scons: building terminated because of errors.
> cod:gale patricerey$ 
> _______________
> 
> It seems that there is a problem with AbstractContext.h.
> 
> Any clue
> 
> Patrice