error: identifier "class" is undefined

OK, this is frustrating, yesterday I thought I figured it out but I am getting this error again:

error: identifier "class" is undefined

So far I tried everything, including renaming main.c to main.cpp and in 

Project => options => Build => MSP430 Compiler => Advanced Options => Language Options => Treat C files as C++ file

My target is MSP430FR5939, and I am using free version of CCS5.  Does free version support C++?  We are considering switching to this hot new controller, but I cant get started with it, do I need to buy CCS seat or is this CCS bug?  Am I doing something wrong.  Below is the listing of the class, it chokes on "class"

class CharQueue
{
private:
void start_pp(); // incruments start pointer
void end_pp(); // incruments end pointer
// shoudl be private
unsigned int start; // First character in buffer
unsigned int end; // Next open Character Character in buffer
unsigned char buffer[BUFF_LEN];

public:
CharQueue(); // constructor
int enqueue(unsigned char data[], int data_length); // add string to stack
int enqueue(unsigned char); // add char to stack - overloaded
int buffer_size(); // returns true if stack is not empty
char dequeue_char(); // deque char from stack (DISABLES INTERRUPTS)
};