Merge 'master' into noverlay

1 files changed, 0 insertions, 38 deletions

diff --git a/test/manual/cedet/tests/testfriends.cpp b/test/manual/cedet/tests/testfriends.cpp
deleted file mode 100644
index 20425f93afa..00000000000
--- a/test/manual/cedet/tests/testfriends.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test parsing of friends and how they are used in completion.
-/*
-  >>  Thanks Damien Profeta for the nice example.
-  >
-  >  I paste a small example.
-  >  It would be great if friend can be well parsed and even greater if
-  >  class B can access to all the members of A.
-*/
-
-class Af // %2% ( ( "testfriends.cpp" ) ( "Af" "B::testB" ) )
-{
-public:
-  int pubVar;
-private:
-  int privateVar;
-
-  friend class B;
-
-};
-
-class B
-{
-public:
-  int testB();
-  int testAB();
-
-};
-
-
-int B::testB() {
-  Af classA;
-  classA.//-1-
-    ; //#1# ( "privateVar" "pubVar" )
-}
-
-int B::testAB() { // %1% ( ( "testfriends.cpp" ) ( "B" "B::testAB" ) )
-}
-