Permalink
Browse files

* .clang complete now uses older libstdc++ for compatibility;

  * started Instruction class
  • Loading branch information...
1 parent fdb2fe7 commit 0b79a049125fbe853c9d41e04952f757090ed5db @sztomi committed Apr 28, 2011
Showing with 6 additions and 7 deletions.
  1. +1 −1 .clang_complete
  2. +2 −2 src/mipscpu.h
  3. +2 −3 test/main.cpp
  4. +1 −1 thirdparty/include/gtest/internal/gtest-port.h
View
@@ -1 +1 @@
--I /usr/include/c++/4.5.2/i686-linux-gnu/ -I /usr/include/c++/4.5.2
+-I /usr/include/c++/4.4.5/i686-linux-gnu/ -I /usr/include/c++/4.4.5
View
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#ifndef _MIPCPU_H
-#define _MIPCPU_H
+#ifndef _MIPSCPU_H
+#define _MIPSCPU_H
#include <boost/cstdint.hpp>
#include <boost/shared_ptr.hpp>
View
@@ -21,12 +21,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-
#include <iostream>
#include "../src/mipscpu.h"
+#include "gtest/gtest.h"
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
{
- std::cout << "hello";
return 0;
}
@@ -449,7 +449,7 @@
// defining __GNUC__ and friends, but cannot compile GCC's tuple
// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB
// Feature Pack download, which we cannot assume the user has.
-# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \
+# if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(__clang__) && (GTEST_GCC_VER_ >= 40000)) \
|| _MSC_VER >= 1600
# define GTEST_USE_OWN_TR1_TUPLE 0
# else

0 comments on commit 0b79a04

Please sign in to comment.