From ece8e37782006789b51dff10d3bbf75191808972 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Wed, 19 Sep 2012 10:31:13 -0400
Subject: [PATCH] fixed endif in molck cmake list fixed return type for
GetSolidColor in vertex_arrray.hh re-added accidentally deleted function
declaration in chain_type.hh
---
modules/gfx/src/vertex_array.hh | 2 +-
modules/mol/base/src/chain_type.hh | 1 +
tools/molck/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/modules/gfx/src/vertex_array.hh b/modules/gfx/src/vertex_array.hh
index 221c05ac9..ac24ef85a 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 86c137aac..82d9115f9 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 9a3fe56fb..4e1dc2fb7 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)
--
GitLab