diff options
author | Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-11 19:39:01 +0100 |
---|---|---|
committer | Hauke Heibel <hauke.heibel@gmail.com> | 2009-12-11 19:39:01 +0100 |
commit | 494a88685ee995b34da0f3b79a68fa06c0ee63ff (patch) | |
tree | f2e15f8e4c4003ae9d4203d83de651a7ab7914ab | |
parent | 9a8c16810be4e4859152789e125fbbcce6c0aeb3 (diff) |
Fixed the bad fix - now the unsupported examples and snippets work on windows.
-rw-r--r-- | doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | doc/snippets/MatrixBase_extract.cpp | 4 | ||||
-rw-r--r-- | doc/snippets/MatrixBase_marked.cpp | 4 | ||||
-rw-r--r-- | doc/snippets/MatrixBase_part.cpp | 4 | ||||
-rw-r--r-- | unsupported/doc/CMakeLists.txt | 8 | ||||
-rw-r--r-- | unsupported/doc/examples/MatrixExponential.cpp | 2 |
6 files changed, 13 insertions, 11 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 1d20a6075..af756a516 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -63,7 +63,7 @@ add_custom_target( ) add_dependencies(doc-eigen-prerequisites all_snippets all_examples) -# add_dependencies(doc-unsupported-prerequisites unsupported_snippets unsupported_examples) +add_dependencies(doc-unsupported-prerequisites unsupported_snippets unsupported_examples) add_custom_target(doc ALL COMMAND doxygen Doxyfile-unsupported COMMAND doxygen diff --git a/doc/snippets/MatrixBase_extract.cpp b/doc/snippets/MatrixBase_extract.cpp index a5ccd7574..c96220f72 100644 --- a/doc/snippets/MatrixBase_extract.cpp +++ b/doc/snippets/MatrixBase_extract.cpp @@ -1,4 +1,6 @@ -#warning deprecated +#ifndef _MSC_VER + #warning deprecated +#endif /* deprecated Matrix3i m = Matrix3i::Random(); cout << "Here is the matrix m:" << endl << m << endl; diff --git a/doc/snippets/MatrixBase_marked.cpp b/doc/snippets/MatrixBase_marked.cpp index f536773c9..f60712178 100644 --- a/doc/snippets/MatrixBase_marked.cpp +++ b/doc/snippets/MatrixBase_marked.cpp @@ -1,4 +1,6 @@ -#warning deprecated +#ifndef _MSC_VER + #warning deprecated +#endif /* Matrix3d m = Matrix3d::Zero(); m.part<Eigen::UpperTriangular>().setOnes(); diff --git a/doc/snippets/MatrixBase_part.cpp b/doc/snippets/MatrixBase_part.cpp index 81e66c4cd..d3e7f482e 100644 --- a/doc/snippets/MatrixBase_part.cpp +++ b/doc/snippets/MatrixBase_part.cpp @@ -1,4 +1,6 @@ -#warning deprecated +#ifndef _MSC_VER + #warning deprecated +#endif /* Matrix3d m = Matrix3d::Zero(); m.part<Eigen::StrictlyUpperTriangular>().setOnes(); diff --git a/unsupported/doc/CMakeLists.txt b/unsupported/doc/CMakeLists.txt index a50d07798..9e9ab9800 100644 --- a/unsupported/doc/CMakeLists.txt +++ b/unsupported/doc/CMakeLists.txt @@ -1,8 +1,4 @@ - set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL TRUE) - -if(NOT MSVC) - add_subdirectory(examples) - add_subdirectory(snippets) -endif(NOT MSVC) +add_subdirectory(examples) +add_subdirectory(snippets) diff --git a/unsupported/doc/examples/MatrixExponential.cpp b/unsupported/doc/examples/MatrixExponential.cpp index 86062e3a6..7dc2396df 100644 --- a/unsupported/doc/examples/MatrixExponential.cpp +++ b/unsupported/doc/examples/MatrixExponential.cpp @@ -4,7 +4,7 @@ using namespace Eigen; int main() { - const double pi = std::acos(-1); + const double pi = std::acos(-1.0); MatrixXd A(3,3); A << 0, -pi/4, 0, |