From bea3673ae1b3d19585dec56e96dbcd8a56b96e6d Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 3 Feb 2017 17:02:58 -0500 Subject: Renamed object join fields to prevent conflicts with class names This was not a problem with clang but it caused compilation errors with gcc. --- lib/pronunciation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/pronunciation.h') diff --git a/lib/pronunciation.h b/lib/pronunciation.h index c7a1d4d..e171fe8 100644 --- a/lib/pronunciation.h +++ b/lib/pronunciation.h @@ -138,7 +138,7 @@ namespace verbly { // Relationships to other objects - static const field form; + static const field forms; private: bool valid_ = false; -- cgit 1.4.1