Re: [boost] [modularization] Missing libs/core file

Le 04/06/14 22:22, Daniel James a écrit :

On 4 June 2014 20:47, Vicente J. Botet Escriba wrote:

...

Le 04/06/14 21:07, Vicente J. Botet Escriba a écrit :

...

Le 04/06/14 19:45, Andrey Semashev a écrit :

...

On Wednesday 04 June 2014 19:20:30 Vicente J. Botet Escriba wrote:

...

Hi, I don't reach to get the last changes in libs/core after un update of the whole boost repository and it modules

That should be 'git submodule update --init'

Thanks, this works. Yet another issue

Unable to checkout '7ff004658ebc7b48cf73028e71b6d7b831a5d0c8' in submodule path 'libs/predef' When you get that the actual error is normally earlier in the output. It could be that the fetch failed, or that you've got a change in your local copy so it won't overwrite it with the new version. Try changing to 'libs/predef' and run 'git fetch' and 'git status'.

See the result of the commands below. I don't know why there are merge issues, as I didn't changed anything in this repository :( Thanks, Vicente cd ../modular-boost/libs/predef/ new-host:predef viboes$ git fetch remote: Counting objects: 2, done. remote: Compressing objects: 100% (2/2), done. remote: Total 2 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. From github.com:boostorg/predef db42762..dc66ebd develop -> origin/develop new-host:predef viboes$ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 5 and 74 different commit(s) each, respectively. # # Changes to be committed: # # new file: .gitignore # new file: .project # new file: doc/history.qbk # new file: doc/html/.gitignore # new file: doc/html/predef/history.html # new file: doc/html/predef/reference/boost_plat_platform_macros.html # new file: doc/html/predef/to_do.html # new file: doc/todo.qbk # new file: include/boost/predef/detail/comp_detected.h # new file: include/boost/predef/detail/platform_detected.h # new file: include/boost/predef/os/ios.h # new file: include/boost/predef/platform/windows_desktop.h # new file: include/boost/predef/platform/windows_phone.h # new file: include/boost/predef/platform/windows_runtime.h # new file: include/boost/predef/platform/windows_store.h # new file: include/boost/predef/version.h # new file: jamroot.jam # new file: test/.gitignore # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both added: doc/build.jam # both added: doc/html/index.html # both added: doc/html/predef/acknoledgements.html # both added: doc/html/predef/adding_new_predefs.html # both added: doc/html/predef/introduction.html # both added: doc/html/predef/reference.html # both added: doc/html/predef/reference/boost_arch_architecture_macros.html # both added: doc/html/predef/reference/boost_comp_compiler_macros.html # both added: doc/html/predef/reference/boost_lang_language_standards_ma.html # both added: doc/html/predef/reference/boost_lib_library_macros.html # both added: doc/html/predef/reference/boost_os_operating_system_macros.html # both added: doc/html/predef/reference/other_macros.html # both added: doc/html/predef/reference/version_definition_macros.html # both added: doc/html/predef/using_the_predefs.html # both added: doc/predef.qbk # both added: include/boost/predef.h # both added: include/boost/predef/architecture.h # both added: include/boost/predef/architecture/alpha.h # both added: include/boost/predef/architecture/arm.h # both added: include/boost/predef/architecture/blackfin.h # both added: include/boost/predef/architecture/convex.h # both added: include/boost/predef/architecture/ia64.h # both added: include/boost/predef/architecture/m68k.h # both added: include/boost/predef/architecture/mips.h # both added: include/boost/predef/architecture/parisc.h # both added: include/boost/predef/architecture/ppc.h # both added: include/boost/predef/architecture/pyramid.h # both added: include/boost/predef/architecture/rs6k.h # both added: include/boost/predef/architecture/sparc.h # both added: include/boost/predef/architecture/superh.h # both added: include/boost/predef/architecture/sys370.h # both added: include/boost/predef/architecture/sys390.h # both added: include/boost/predef/architecture/x86.h # both added: include/boost/predef/architecture/x86/32.h # both added: include/boost/predef/architecture/x86/64.h # both added: include/boost/predef/architecture/z.h # both added: include/boost/predef/compiler.h # both added: include/boost/predef/compiler/borland.h # both added: include/boost/predef/compiler/clang.h # both added: include/boost/predef/compiler/comeau.h # both added: include/boost/predef/compiler/compaq.h # both added: include/boost/predef/compiler/diab.h # both added: include/boost/predef/compiler/digitalmars.h # both added: include/boost/predef/compiler/dignus.h # both added: include/boost/predef/compiler/edg.h # both added: include/boost/predef/compiler/ekopath.h # both added: include/boost/predef/compiler/gcc.h # both added: include/boost/predef/compiler/gcc_xml.h # both added: include/boost/predef/compiler/greenhills.h # both added: include/boost/predef/compiler/hp_acc.h # both added: include/boost/predef/compiler/iar.h # both added: include/boost/predef/compiler/ibm.h # both added: include/boost/predef/compiler/intel.h # both added: include/boost/predef/compiler/kai.h # both added: include/boost/predef/compiler/llvm.h # both added: include/boost/predef/compiler/metaware.h # both added: include/boost/predef/compiler/metrowerks.h # both added: include/boost/predef/compiler/microtec.h # both added: include/boost/predef/compiler/mpw.h # both added: include/boost/predef/compiler/palm.h # both added: include/boost/predef/compiler/pgi.h # both added: include/boost/predef/compiler/sgi_mipspro.h # both added: include/boost/predef/compiler/sunpro.h # both added: include/boost/predef/compiler/tendra.h # both added: include/boost/predef/compiler/visualc.h # both added: include/boost/predef/compiler/watcom.h # both added: include/boost/predef/detail/_cassert.h # both added: include/boost/predef/detail/_exception.h # both added: include/boost/predef/detail/endian_compat.h # both added: include/boost/predef/detail/os_detected.h # both added: include/boost/predef/detail/test.h # both added: include/boost/predef/language.h # both added: include/boost/predef/language/objc.h # both added: include/boost/predef/language/stdc.h # both added: include/boost/predef/language/stdcpp.h # both added: include/boost/predef/library.h # both added: include/boost/predef/library/c.h # both added: include/boost/predef/library/c/_prefix.h # both added: include/boost/predef/library/c/gnu.h # both added: include/boost/predef/library/c/uc.h # both added: include/boost/predef/library/c/vms.h # both added: include/boost/predef/library/c/zos.h # both added: include/boost/predef/library/std.h # both added: include/boost/predef/library/std/_prefix.h # both added: include/boost/predef/library/std/cxx.h # both added: include/boost/predef/library/std/dinkumware.h # both added: include/boost/predef/library/std/libcomo.h # both added: include/boost/predef/library/std/modena.h # both added: include/boost/predef/library/std/msl.h # both added: include/boost/predef/library/std/roguewave.h # both added: include/boost/predef/library/std/sgi.h # both added: include/boost/predef/library/std/stdcpp3.h # both added: include/boost/predef/library/std/stlport.h # both added: include/boost/predef/library/std/vacpp.h # both added: include/boost/predef/make.h # both added: include/boost/predef/os.h # both added: include/boost/predef/os/aix.h # both added: include/boost/predef/os/amigaos.h # both added: include/boost/predef/os/android.h # both added: include/boost/predef/os/beos.h # both added: include/boost/predef/os/bsd.h # both added: include/boost/predef/os/bsd/bsdi.h # both added: include/boost/predef/os/bsd/dragonfly.h # both added: include/boost/predef/os/bsd/free.h # both added: include/boost/predef/os/bsd/net.h # both added: include/boost/predef/os/bsd/open.h # both added: include/boost/predef/os/cygwin.h # both added: include/boost/predef/os/hpux.h # both added: include/boost/predef/os/irix.h # both added: include/boost/predef/os/linux.h # both added: include/boost/predef/os/macos.h # both added: include/boost/predef/os/os400.h # both added: include/boost/predef/os/qnxnto.h # both added: include/boost/predef/os/solaris.h # both added: include/boost/predef/os/unix.h # both added: include/boost/predef/os/vms.h # both added: include/boost/predef/os/windows.h # both added: include/boost/predef/other.h # both added: include/boost/predef/other/endian.h # both added: include/boost/predef/platform.h # both added: include/boost/predef/platform/mingw.h # both added: include/boost/predef/version_number.h # both added: index.html # both added: test/build.jam # both added: test/info_as_c.c # both added: test/info_as_cpp.cpp # both added: test/info_as_objc.m # both added: test/info_as_objcpp.mm # both added: test/macos_endian.c # both added: test/macos_vs_bsd.c # both added: test/make.cpp # both added: test/version.cpp #