diff --git a/modules/gfx/src/vertex_array.hh b/modules/gfx/src/vertex_array.hh index 221c05ac956546940e1acf33e9e21fc19c0650e9..ac24ef85a01f8e6b0680af7d47729a7e154c4725 100644 --- a/modules/gfx/src/vertex_array.hh +++ b/modules/gfx/src/vertex_array.hh @@ -134,7 +134,7 @@ class DLLEXPORT_OST_GFX IndexedVertexArray { void SetSolid(bool f) {solid_=f;} bool GetSolid() const {return solid_;} void SetSolidColor(const Color& c) {solid_color_=c;} - bool GetSolidcolor() const {return solid_color_;} + Color GetSolidcolor() const {return solid_color_;} void SetClipOffset(float f) {clip_offset_=f;} float GetClipOffset() const {return clip_offset_;} diff --git a/modules/mol/base/src/chain_type.hh b/modules/mol/base/src/chain_type.hh index 86c137aac61e23c8b6404e8329c339023c406491..82d9115f9d1653c579ec49d5538dc29399eb0551 100644 --- a/modules/mol/base/src/chain_type.hh +++ b/modules/mol/base/src/chain_type.hh @@ -57,6 +57,7 @@ ChainType DLLEXPORT_OST_MOL ChainTypeFromString(const StringRef identifier); /// /// \return The ChainType corresponding to the input, throws a /// ost::Error on unknown type +ChainType DLLEXPORT_OST_MOL ChainTypeFromString(const String& identifier); /// \brief Return the String identifier for a given type /// diff --git a/tools/molck/CMakeLists.txt b/tools/molck/CMakeLists.txt index 9a3fe56fb41785aa0220ab9ca9c2375490138aad..4e1dc2fb79b73e90022dd2f546a5011c98eca118 100644 --- a/tools/molck/CMakeLists.txt +++ b/tools/molck/CMakeLists.txt @@ -1,4 +1,4 @@ if (NOT WIN32) executable(NAME molck SOURCES main.cc DEPENDS_ON ost_io STATIC) -endif(WIN32) +endif(NOT WIN32)