uSTL config.h clash

uSTL config.h clash

[Uwe Kindler]

Hi John,

if I move the all uSTL headers except of ustl.h into an ustl 
subdirectory, then I need to touch almost all include directives in the 
ustl header and source files. I.e. in unew.c I would replace #include 
"unew.h" by #include "ustl/unew.h". Did I understand this right?

Another solution would be to rename config.h into something like 
ustlconfig.h and rename all include directives that include config.h 
into #include "ustlconfig.h". This would avoid a name clash but the ustl 
headers would still pollute the toplevel include directory.

What would you prefer?

Regards, Uwe

Re: uSTL config.h clash

[John Dallaway]

Hi Uwe

Uwe Kindler wrote:

> if I move the all uSTL headers except of ustl.h into an ustl
> subdirectory, then I need to touch almost all include directives in the
> ustl header and source files. I.e. in unew.c I would replace #include
> "unew.h" by #include "ustl/unew.h". Did I understand this right?

I've just taken a quick look at the sources. It is indeed unfortunate
that the #includes in the various header files do not specify the ustl/
subdirectory like ustl.h does in the upstream sources. The quick fix
here is to rename config.h to something like ustlcfg.h as you suggest.
But I'm concerned that other conflicts may arise in the future.

Why does the original author make a distinction between include paths in
ustl.h and in the other ustl header files?

John Dallaway

Re: uSTL config.h clash

[John Dallaway]

Hi Uwe

John Dallaway wrote:

> Uwe Kindler wrote:
> 
>> if I move the all uSTL headers except of ustl.h into an ustl
>> subdirectory, then I need to touch almost all include directives in the
>> ustl header and source files. I.e. in unew.c I would replace #include
>> "unew.h" by #include "ustl/unew.h". Did I understand this right?
> 
> I've just taken a quick look at the sources. It is indeed unfortunate
> that the #includes in the various header files do not specify the ustl/
> subdirectory like ustl.h does in the upstream sources. The quick fix
> here is to rename config.h to something like ustlcfg.h as you suggest.
> But I'm concerned that other conflicts may arise in the future.
> 
> Why does the original author make a distinction between include paths in
> ustl.h and in the other ustl header files?

To answer my own question, I now note that the original code uses a
ustl/ symlink.

I think the correct long-term approach for eCos is to move the header
files (other than ustl.h) into include/ustl/ and to modify the source
code accordingly. This will involve changes to many files but the
changes are trivial and can be applied using a simple substitution so
this should not impact future code imports much. If you agree with this
approach, I will make the changes.

John Dallaway

Re: uSTL config.h clash

[Uwe Kindler]

Hi John,

I think your proposal is the best solution for the uSTL eCos port and I 
agree that the changes are trivial. It would be great if you could do 
the changes.

Thank you.

Uwe

Re: uSTL config.h clash

[Uwe Kindler]

Hi John,

I forgot one last question - what about the stdint.h header file? That 
should not go into an ustl subfolder. But I think you already know this ;O)

Uwe

Re: uSTL config.h clash

[John Dallaway]

Hi Uwe

John Dallaway wrote:

> I think the correct long-term approach for eCos is to move the header
> files (other than ustl.h) into include/ustl/ and to modify the source
> code accordingly. This will involve changes to many files but the
> changes are trivial and can be applied using a simple substitution so
> this should not impact future code imports much. If you agree with this
> approach, I will make the changes.

Done. I did not need to change many files after all. I simply added the
new include/ustl/ directory to the compiler's list of header file
directories via CYGPKG_USTL_CFLAGS_ADD. In fact, ustl.h is now closer to
the upstream version.

John Dallaway

uSTL config.h clash

[John Dallaway]

Hi Uwe

There's a problem with uSTL's config.h clashing with a header file used
by the SNMP library package. In this case, it is clear that the uSTL
header files should not be polluting the top-level include/ directory
unless this is necessary as part of the contract with application code.

I note that the upstream version of "ustl.h" looks for the other headers
in a ustl/ subdirectory. Are you able to move all the other headers
(including config.h) into include/ustl/ within the package without
disrupting the rest of the sources too much?

John Dallaway