we don't need these compile-time tests. if '<' is defined we use it, otherwise...

we don't need these compile-time tests. if '<' is defined we use it, otherwise the compiler will complain

[[Imported from SVN: r4667]]